summaryrefslogtreecommitdiff
path: root/indra/llui/llsliderctrl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llui/llsliderctrl.cpp')
-rw-r--r--indra/llui/llsliderctrl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llsliderctrl.cpp b/indra/llui/llsliderctrl.cpp
index c46ec2252f..dd4a9941c5 100644
--- a/indra/llui/llsliderctrl.cpp
+++ b/indra/llui/llsliderctrl.cpp
@@ -170,7 +170,7 @@ void LLSliderCtrl::setValue(F32 v, BOOL from_event)
updateText();
}
-BOOL LLSliderCtrl::setLabelArg( const LLString& key, const LLString& text )
+BOOL LLSliderCtrl::setLabelArg( const LLString& key, const LLStringExplicit& text )
{
BOOL res = FALSE;
if (mLabelBox)
@@ -200,11 +200,11 @@ void LLSliderCtrl::clear()
setValue(0.0f);
if( mEditor )
{
- mEditor->setText( "" );
+ mEditor->setText( LLString::null );
}
if( mTextBox )
{
- mTextBox->setText( "" );
+ mTextBox->setText( LLString::null );
}
}