Second Life viewer sources 1.18.4.0-RC

1 files changed, 12 insertions, 9 deletions

diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index b71d88f..5f76cfc 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -2,6 +2,8 @@
  * @file llcombobox.cpp
  * @brief LLComboBox 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$
  */
 
 // A control that displays the name of the chosen item, which when
@@ -226,12 +229,12 @@ void LLComboBox::clear()
 { 
         if (mTextEntry)
         {
-                mTextEntry->setText("");
+                mTextEntry->setText(LLString::null);
         }
-        mButton->setLabelSelected("");
-        mButton->setLabelUnselected("");
-        mButton->setDisabledLabel("");
-        mButton->setDisabledSelectedLabel("");
+        mButton->setLabelSelected(LLString::null);
+        mButton->setLabelUnselected(LLString::null);
+        mButton->setDisabledLabel(LLString::null);
+        mButton->setDisabledSelectedLabel(LLString::null);
         mList->deselectAllItems();
 }
 
@@ -306,7 +309,7 @@ void LLComboBox::sortByName()
 
 // Choose an item with a given name in the menu.
 // Returns TRUE if the item was found.
-BOOL LLComboBox::setSimple(const LLString& name)
+BOOL LLComboBox::setSimple(const LLStringExplicit& name)
 {
         BOOL found = mList->selectSimpleItem(name, FALSE);
 
@@ -368,7 +371,7 @@ LLSD LLComboBox::getValue() const
         }
 }
 
-void LLComboBox::setLabel(const LLString& name)
+void LLComboBox::setLabel(const LLStringExplicit& name)
 {
         if ( mAllowTextEntry )
         {
@@ -800,7 +803,7 @@ void LLComboBox::setAllowTextEntry(BOOL allow, S32 max_chars, BOOL set_tentative
 
                 // clear label on button
                 LLString cur_label = mButton->getLabelSelected();
-                setLabel("");
+                setLabel(LLString::null);
                 if (!mTextEntry)
                 {
                         LLRect text_entry_rect(0, mRect.getHeight(), mRect.getWidth(), 0);
@@ -849,7 +852,7 @@ void LLComboBox::setAllowTextEntry(BOOL allow, S32 max_chars, BOOL set_tentative
         mTextEntryTentative = set_tentative;    
 }
 
-void LLComboBox::setTextEntry(const LLString& text)
+void LLComboBox::setTextEntry(const LLStringExplicit& text)
 {
         if (mTextEntry)
         {