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/llnavigationbar.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/llnavigationbar.cpp')
| -rw-r--r-- | indra/newview/llnavigationbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 69cebcfb5e..b1db51dd26 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -298,7 +298,7 @@ void LLNavigationBar::onHomeButtonClicked() void LLNavigationBar::onSearchCommit() { - std::string search_query = mSearchComboBox->getValue().asString(); + std::string search_query = mSearchComboBox->getSimple(); if(!search_query.empty()) { LLSearchHistory::getInstance()->addEntry(search_query); |