summaryrefslogtreecommitdiff
path: root/indra/newview/llnavigationbar.cpp
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-09-14 14:31:25 -0700
committerBryan O'Sullivan <bos@lindenlab.com>2009-09-14 14:31:25 -0700
commit562006aa5585a42418cae978516505035cd34d8d (patch)
treef42488d1b07907937f5b9e236617d9f02297d32d /indra/newview/llnavigationbar.cpp
parent9a8042d5a3edfd07727793a1939c3ab361ceec9a (diff)
parent7cd1020f2953b776e1878e7b4e365d4b23e6b07b (diff)
Merge with SVN viewer-2.0.0-3 branch
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
-rw-r--r--indra/newview/llnavigationbar.cpp2
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);