aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llsliderctrl.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/llsliderctrl.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/llui/llsliderctrl.cpp b/linden/indra/llui/llsliderctrl.cpp
index dff27cc..dd4a994 100644
--- a/linden/indra/llui/llsliderctrl.cpp
+++ b/linden/indra/llui/llsliderctrl.cpp
@@ -2,6 +2,8 @@
2 * @file llsliderctrl.cpp 2 * @file llsliderctrl.cpp
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#include "linden_common.h" 32#include "linden_common.h"
@@ -167,7 +170,7 @@ void LLSliderCtrl::setValue(F32 v, BOOL from_event)
167 updateText(); 170 updateText();
168} 171}
169 172
170BOOL LLSliderCtrl::setLabelArg( const LLString& key, const LLString& text ) 173BOOL LLSliderCtrl::setLabelArg( const LLString& key, const LLStringExplicit& text )
171{ 174{
172 BOOL res = FALSE; 175 BOOL res = FALSE;
173 if (mLabelBox) 176 if (mLabelBox)
@@ -197,11 +200,11 @@ void LLSliderCtrl::clear()
197 setValue(0.0f); 200 setValue(0.0f);
198 if( mEditor ) 201 if( mEditor )
199 { 202 {
200 mEditor->setText( "" ); 203 mEditor->setText( LLString::null );
201 } 204 }
202 if( mTextBox ) 205 if( mTextBox )
203 { 206 {
204 mTextBox->setText( "" ); 207 mTextBox->setText( LLString::null );
205 } 208 }
206 209
207} 210}