diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llui/llsliderctrl.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/llui/llsliderctrl.h b/linden/indra/llui/llsliderctrl.h index 6896360..fa6c0bc 100644 --- a/linden/indra/llui/llsliderctrl.h +++ b/linden/indra/llui/llsliderctrl.h | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file llsliderctrl.h | 2 | * @file llsliderctrl.h |
3 | * @brief LLSliderCtrl base class | 3 | * @brief LLSliderCtrl base class |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2002&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2002-2007, Linden Research, Inc. | 7 | * Copyright (c) 2002-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,6 +26,7 @@ | |||
24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
29 | * $/LicenseInfo$ | ||
27 | */ | 30 | */ |
28 | 31 | ||
29 | #ifndef LL_LLSLIDERCTRL_H | 32 | #ifndef LL_LLSLIDERCTRL_H |
@@ -77,7 +80,7 @@ public: | |||
77 | 80 | ||
78 | virtual void setValue(const LLSD& value ) { setValue((F32)value.asReal(), TRUE); } | 81 | virtual void setValue(const LLSD& value ) { setValue((F32)value.asReal(), TRUE); } |
79 | virtual LLSD getValue() const { return LLSD(getValueF32()); } | 82 | virtual LLSD getValue() const { return LLSD(getValueF32()); } |
80 | virtual BOOL setLabelArg( const LLString& key, const LLString& text ); | 83 | virtual BOOL setLabelArg( const LLString& key, const LLStringExplicit& text ); |
81 | 84 | ||
82 | virtual void setMinValue(LLSD min_value) { setMinValue((F32)min_value.asReal()); } | 85 | virtual void setMinValue(LLSD min_value) { setMinValue((F32)min_value.asReal()); } |
83 | virtual void setMaxValue(LLSD max_value) { setMaxValue((F32)max_value.asReal()); } | 86 | virtual void setMaxValue(LLSD max_value) { setMaxValue((F32)max_value.asReal()); } |
@@ -94,7 +97,7 @@ public: | |||
94 | F32 getMinValue() { return mSlider->getMinValue(); } | 97 | F32 getMinValue() { return mSlider->getMinValue(); } |
95 | F32 getMaxValue() { return mSlider->getMaxValue(); } | 98 | F32 getMaxValue() { return mSlider->getMaxValue(); } |
96 | 99 | ||
97 | void setLabel(const LLString& label) { if (mLabelBox) mLabelBox->setText(label); } | 100 | void setLabel(const LLStringExplicit& label) { if (mLabelBox) mLabelBox->setText(label); } |
98 | void setLabelColor(const LLColor4& c) { mTextEnabledColor = c; } | 101 | void setLabelColor(const LLColor4& c) { mTextEnabledColor = c; } |
99 | void setDisabledLabelColor(const LLColor4& c) { mTextDisabledColor = c; } | 102 | void setDisabledLabelColor(const LLColor4& c) { mTextDisabledColor = c; } |
100 | 103 | ||