diff options
Diffstat (limited to 'linden/indra/newview/llpanelface.h')
-rw-r--r-- | linden/indra/newview/llpanelface.h | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/linden/indra/newview/llpanelface.h b/linden/indra/newview/llpanelface.h index b41d0e5..d680129 100644 --- a/linden/indra/newview/llpanelface.h +++ b/linden/indra/newview/llpanelface.h | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file llpanelface.h | 2 | * @file llpanelface.h |
3 | * @brief Panel in the tools floater for editing face textures, colors, etc. | 3 | * @brief Panel in the tools floater for editing face textures, colors, etc. |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 7 | * Copyright (c) 2001-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,6 +26,7 @@ | |||
24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
29 | * $/LicenseInfo$ | ||
27 | */ | 30 | */ |
28 | 31 | ||
29 | #ifndef LL_LLPANELFACE_H | 32 | #ifndef LL_LLPANELFACE_H |
@@ -54,11 +57,6 @@ public: | |||
54 | void refresh(); | 57 | void refresh(); |
55 | 58 | ||
56 | protected: | 59 | protected: |
57 | // Given a callback function that returns an F32, figures out | ||
58 | // if that F32 is the same for all selected faces. "value" | ||
59 | // contains the identical value, or the first object's value. | ||
60 | BOOL allFacesSameValue( F32 (get_face_value(LLViewerObject*, S32)), F32 *value); | ||
61 | |||
62 | void getState(); | 60 | void getState(); |
63 | 61 | ||
64 | void sendTexture(); // applies and sends texture | 62 | void sendTexture(); // applies and sends texture |
@@ -88,17 +86,6 @@ protected: | |||
88 | 86 | ||
89 | static void onClickApply(void*); | 87 | static void onClickApply(void*); |
90 | static void onClickAutoFix(void*); | 88 | static void onClickAutoFix(void*); |
91 | |||
92 | static F32 valueScaleS(LLViewerObject* object, S32 face); | ||
93 | static F32 valueScaleT(LLViewerObject* object, S32 face); | ||
94 | static F32 valueOffsetS(LLViewerObject* object, S32 face); | ||
95 | static F32 valueOffsetT(LLViewerObject* object, S32 face); | ||
96 | static F32 valueTexRotation(LLViewerObject* object, S32 face); | ||
97 | static F32 valueRepeatsPerMeter(LLViewerObject* object, S32 face); | ||
98 | static F32 valueBump(LLViewerObject* object, S32 face); | ||
99 | static F32 valueTexGen(LLViewerObject* object, S32 face); | ||
100 | static F32 valueShiny(LLViewerObject* object, S32 face); | ||
101 | static F32 valueFullbright(LLViewerObject* object, S32 face); | ||
102 | }; | 89 | }; |
103 | 90 | ||
104 | #endif | 91 | #endif |