From 215f423cbe18fe9ca14a26caef918d303bad28ff Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:11 -0500
Subject: Second Life viewer sources 1.18.4.0-RC

---
 linden/indra/llui/llbutton.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'linden/indra/llui/llbutton.cpp')

diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 6ed6885..65cbcf3 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -2,6 +2,8 @@
  * @file llbutton.cpp
  * @brief LLButton base class
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
@@ -773,36 +776,36 @@ LLSD LLButton::getValue() const
 	return mToggleState;
 }
 
-void LLButton::setLabel( const LLString& label )
+void LLButton::setLabel( const LLStringExplicit& label )
 {
 	setLabelUnselected(label);
 	setLabelSelected(label);
 }
 
 //virtual
-BOOL LLButton::setLabelArg( const LLString& key, const LLString& text )
+BOOL LLButton::setLabelArg( const LLString& key, const LLStringExplicit& text )
 {
 	mUnselectedLabel.setArg(key, text);
 	mSelectedLabel.setArg(key, text);
 	return TRUE;
 }
 
-void LLButton::setLabelUnselected( const LLString& label )
+void LLButton::setLabelUnselected( const LLStringExplicit& label )
 {
 	mUnselectedLabel = label;
 }
 
-void LLButton::setLabelSelected( const LLString& label )
+void LLButton::setLabelSelected( const LLStringExplicit& label )
 {
 	mSelectedLabel = label;
 }
 
-void LLButton::setDisabledLabel( const LLString& label )
+void LLButton::setDisabledLabel( const LLStringExplicit& label )
 {
 	mDisabledLabel = label;
 }
 
-void LLButton::setDisabledSelectedLabel( const LLString& label )
+void LLButton::setDisabledSelectedLabel( const LLStringExplicit& label )
 {
 	mDisabledSelectedLabel = label;
 }
-- 
cgit v1.1