diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2007-12-19 00:56:59 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2007-12-19 00:56:59 +0000 |
| commit | 7dd08303a3ebf9718c2c60a4d94b81d5d7845f8c (patch) | |
| tree | 6195a8585cc7998647afcaec2167e728e4abd3c1 /indra/llui/llslider.h | |
| parent | 4d87303e78c1accde85b217b325e0c08930b0c4c (diff) | |
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
Diffstat (limited to 'indra/llui/llslider.h')
| -rw-r--r-- | indra/llui/llslider.h | 7 |
1 files changed, 6 insertions, 1 deletions
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); |