From 7dd08303a3ebf9718c2c60a4d94b81d5d7845f8c Mon Sep 17 00:00:00 2001
From: Jon Wolk <jwolk@lindenlab.com>
Date: Wed, 19 Dec 2007 00:56:59 +0000
Subject: svn merge -r 75354:76103
 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 ->
 release.  Finished product of QAR-134

---
 indra/llui/llslider.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/llui/llslider.h')

diff --git a/indra/llui/llslider.h b/indra/llui/llslider.h
index 2641eaac74..55be2afbcc 100644
--- a/indra/llui/llslider.h
+++ b/indra/llui/llslider.h
@@ -36,6 +36,7 @@
 #include "v4color.h"
 
 class LLUICtrlFactory;
+class LLImageGL;
 
 class LLSlider : public LLUICtrl
 {
@@ -85,6 +86,7 @@ public:
 
 protected:
 	void			setValueAndCommit(F32 value);
+	void			updateThumbRect();
 
 protected:
 	F32				mValue;
@@ -97,11 +99,14 @@ protected:
 	S32				mMouseOffset;
 	LLRect			mDragStartThumbRect;
 
+	LLImageGL*		mThumbImage;
+	LLImageGL*		mTrackImage;
+	LLImageGL*		mTrackHighlightImage;
+
 	LLRect			mThumbRect;
 	LLColor4		mTrackColor;
 	LLColor4		mThumbOutlineColor;
 	LLColor4		mThumbCenterColor;
-	LLColor4		mDisabledThumbColor;
 	
 	void			(*mMouseDownCallback)(LLUICtrl* ctrl, void* userdata);
 	void			(*mMouseUpCallback)(LLUICtrl* ctrl, void* userdata);
-- 
cgit v1.2.3