diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-10 03:12:12 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-10 03:12:12 +0000 |
| commit | ccb1d2b1e43369803cf9ab1ffc7deefbac2db8fc (patch) | |
| tree | 57b085da51db0f63ab249926102f8ebbca8da1ee /indra/newview/llsearchcombobox.cpp | |
| parent | 44f294d484185ef3cb9f51e5cba6a3ee269b96dc (diff) | |
merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
Fixes: EXT-825 EXT-893 EXT-889 EXT-88
Diffstat (limited to 'indra/newview/llsearchcombobox.cpp')
| -rw-r--r-- | indra/newview/llsearchcombobox.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llsearchcombobox.cpp b/indra/newview/llsearchcombobox.cpp index 29d31e8b56..ab5536a12d 100644 --- a/indra/newview/llsearchcombobox.cpp +++ b/indra/newview/llsearchcombobox.cpp @@ -153,16 +153,16 @@ void LLSearchComboBox::onSelectionCommit() std::string search_query = getSimple(); LLStringUtil::trim(search_query); - mTextEntry->setText(search_query); - setControlValue(search_query); - + // Order of add() and mTextEntry->setText does matter because add() will select first item + // in drop down list and its label will be copied to text box rewriting mTextEntry->setText() call if(!search_query.empty()) { remove(search_query); add(search_query, ADD_TOP); } - LLUICtrl::onCommit(); + mTextEntry->setText(search_query); + setControlValue(search_query); } BOOL LLSearchComboBox::remove(const std::string& name) |