From ccb1d2b1e43369803cf9ab1ffc7deefbac2db8fc Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 10 Sep 2009 03:12:12 +0000
Subject: 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

---
 indra/newview/llnavigationbar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llnavigationbar.cpp')

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);
-- 
cgit v1.2.3