Second Life viewer sources 1.18.4.0-RC

1 files changed, 6 insertions, 3 deletions

diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index 1589c30..ff17d28 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -2,6 +2,8 @@
  * @file llcombobox.h
  * @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 clicked
@@ -102,7 +105,7 @@ public:
         virtual LLSD    getValue() const;
 
         void                    setAllowTextEntry(BOOL allow, S32 max_chars = 50, BOOL make_tentative = TRUE);
-        void                    setTextEntry(const LLString& text);
+        void                    setTextEntry(const LLStringExplicit& text);
 
         void                    add(const LLString& name, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);  // add item "name" to menu
         void                    add(const LLString& name, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
@@ -114,7 +117,7 @@ public:
         void                    sortByName(); // Sort the entries in the combobox by name
 
         // Select current item by name using selectSimpleItem.  Returns FALSE if not found.
-        BOOL                    setSimple(const LLString& name);
+        BOOL                    setSimple(const LLStringExplicit& name);
         // Get name of current item. Returns an empty string if not found.
         const LLString& getSimple() const;
         // Get contents of column x of selected row
@@ -122,7 +125,7 @@ public:
 
         // Sets the label, which doesn't have to exist in the label.
         // This is probably a UI abuse.
-        void                    setLabel(const LLString& name);
+        void                    setLabel(const LLStringExplicit& name);
 
         BOOL                    remove(const LLString& name);   // remove item "name", return TRUE if found and removed