aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llslider.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/llslider.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/linden/indra/llui/llslider.h b/linden/indra/llui/llslider.h
index 28a8d07..08ab600 100644
--- a/linden/indra/llui/llslider.h
+++ b/linden/indra/llui/llslider.h
@@ -12,12 +12,12 @@
12 * ("GPL"), unless you have obtained a separate licensing agreement 12 * ("GPL"), unless you have obtained a separate licensing agreement
13 * ("Other License"), formally executed by you and Linden Lab. Terms of 13 * ("Other License"), formally executed by you and Linden Lab. Terms of
14 * the GPL can be found in doc/GPL-license.txt in this distribution, or 14 * the GPL can be found in doc/GPL-license.txt in this distribution, or
15 * online at http://secondlife.com/developers/opensource/gplv2 15 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
16 * 16 *
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlife.com/developers/opensource/flossexception 20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 21 *
22 * By copying, modifying or distributing this software, you acknowledge 22 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 23 * that you have read and understood your obligations described above,
@@ -36,6 +36,7 @@
36#include "v4color.h" 36#include "v4color.h"
37 37
38class LLUICtrlFactory; 38class LLUICtrlFactory;
39class LLImageGL;
39 40
40class LLSlider : public LLUICtrl 41class LLSlider : public LLUICtrl
41{ 42{
@@ -85,6 +86,7 @@ public:
85 86
86protected: 87protected:
87 void setValueAndCommit(F32 value); 88 void setValueAndCommit(F32 value);
89 void updateThumbRect();
88 90
89protected: 91protected:
90 F32 mValue; 92 F32 mValue;
@@ -97,11 +99,14 @@ protected:
97 S32 mMouseOffset; 99 S32 mMouseOffset;
98 LLRect mDragStartThumbRect; 100 LLRect mDragStartThumbRect;
99 101
102 LLImageGL* mThumbImage;
103 LLImageGL* mTrackImage;
104 LLImageGL* mTrackHighlightImage;
105
100 LLRect mThumbRect; 106 LLRect mThumbRect;
101 LLColor4 mTrackColor; 107 LLColor4 mTrackColor;
102 LLColor4 mThumbOutlineColor; 108 LLColor4 mThumbOutlineColor;
103 LLColor4 mThumbCenterColor; 109 LLColor4 mThumbCenterColor;
104 LLColor4 mDisabledThumbColor;
105 110
106 void (*mMouseDownCallback)(LLUICtrl* ctrl, void* userdata); 111 void (*mMouseDownCallback)(LLUICtrl* ctrl, void* userdata);
107 void (*mMouseUpCallback)(LLUICtrl* ctrl, void* userdata); 112 void (*mMouseUpCallback)(LLUICtrl* ctrl, void* userdata);