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.cpp | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/llui/llcombobox.cpp')
| -rw-r--r-- | indra/llui/llcombobox.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 7ed3d3efbd..5f76cfc94b 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -229,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(); } @@ -309,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); @@ -371,7 +371,7 @@ LLSD LLComboBox::getValue() const } } -void LLComboBox::setLabel(const LLString& name) +void LLComboBox::setLabel(const LLStringExplicit& name) { if ( mAllowTextEntry ) { @@ -803,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); @@ -852,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) { |