From 5ec8bbbe2244ea70d8aa74b5c572351632699425 Mon Sep 17 00:00:00 2001 From: Christian Goetze Date: Wed, 10 Oct 2007 00:01:43 +0000 Subject: svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 --- indra/llui/llcheckboxctrl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llui/llcheckboxctrl.cpp') diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp index 08ebfafa53..504b342003 100644 --- a/indra/llui/llcheckboxctrl.cpp +++ b/indra/llui/llcheckboxctrl.cpp @@ -242,7 +242,7 @@ LLSD LLCheckBoxCtrl::getValue() const return mButton->getToggleState(); } -void LLCheckBoxCtrl::setLabel( const LLString& label ) +void LLCheckBoxCtrl::setLabel( const LLStringExplicit& label ) { mLabel->setText( label ); reshape(getRect().getWidth(), getRect().getHeight(), FALSE); @@ -253,7 +253,7 @@ LLString LLCheckBoxCtrl::getLabel() const return mLabel->getText(); } -BOOL LLCheckBoxCtrl::setLabelArg( const LLString& key, const LLString& text ) +BOOL LLCheckBoxCtrl::setLabelArg( const LLString& key, const LLStringExplicit& text ) { BOOL res = mLabel->setTextArg(key, text); reshape(getRect().getWidth(), getRect().getHeight(), FALSE); -- cgit v1.2.3