diff options
author | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
---|---|---|
committer | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
commit | 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch) | |
tree | 3c34a3a180b5275bd4166b0056765c5868f56447 /indra/llui/llslider.h | |
parent | f6a10b3214d79df4e8f5768acaa68edbd2de5620 (diff) |
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
Diffstat (limited to 'indra/llui/llslider.h')
-rw-r--r-- | indra/llui/llslider.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llslider.h b/indra/llui/llslider.h index d88da42064..d9cdf11d5d 100644 --- a/indra/llui/llslider.h +++ b/indra/llui/llslider.h @@ -26,6 +26,7 @@ public: F32 min_value, F32 max_value, F32 increment, + BOOL volume, const LLString& control_name = LLString::null ); virtual EWidgetType getWidgetType() const; @@ -46,6 +47,7 @@ public: F32 getMinValue() const { return mMinValue; } F32 getMaxValue() const { return mMaxValue; } F32 getIncrement() const { return mIncrement; } + BOOL getVolumeSlider() const { return mVolumeSlider; } void setMinValue(F32 min_value) {mMinValue = min_value;} void setMaxValue(F32 max_value) {mMaxValue = max_value;} void setIncrement(F32 increment) {mIncrement = increment;} @@ -59,12 +61,16 @@ public: virtual void draw(); protected: + void setValueAndCommit(F32 value); + +protected: F32 mValue; F32 mInitialValue; F32 mMinValue; F32 mMaxValue; F32 mIncrement; + BOOL mVolumeSlider; S32 mMouseOffset; LLRect mDragStartThumbRect; |