summaryrefslogtreecommitdiff
path: root/indra/llui/llsliderctrl.h
diff options
context:
space:
mode:
authorMonroe Williams <monroe@lindenlab.com>2007-08-02 01:18:34 +0000
committerMonroe Williams <monroe@lindenlab.com>2007-08-02 01:18:34 +0000
commit7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch)
tree3c34a3a180b5275bd4166b0056765c5868f56447 /indra/llui/llsliderctrl.h
parentf6a10b3214d79df4e8f5768acaa68edbd2de5620 (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/llsliderctrl.h')
-rw-r--r--indra/llui/llsliderctrl.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llsliderctrl.h b/indra/llui/llsliderctrl.h
index 2185e42eb1..0780350462 100644
--- a/indra/llui/llsliderctrl.h
+++ b/indra/llui/llsliderctrl.h
@@ -40,6 +40,7 @@ public:
S32 text_left,
BOOL show_text,
BOOL can_edit_text,
+ BOOL volume,
void (*commit_callback)(LLUICtrl*, void*),
void* callback_userdata,
F32 initial_value, F32 min_value, F32 max_value, F32 increment,
@@ -104,7 +105,8 @@ private:
const LLFontGL* mFont;
BOOL mShowText;
BOOL mCanEditText;
-
+ BOOL mVolumeSlider;
+
S32 mPrecision;
LLTextBox* mLabelBox;
S32 mLabelWidth;