diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/llui/llcombobox.h | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/llui/llcombobox.h')
| -rw-r--r-- | indra/llui/llcombobox.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index 9b47bfcabb..ff17d2874f 100644 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -105,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); @@ -117,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 @@ -125,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 |