diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-09 17:10:06 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-09 17:10:06 -0700 |
| commit | a997e131d4262f0a18a6f4f8c305c73edbfea6b6 (patch) | |
| tree | 5b7f8595e7911f4fd7ba6f2824c6b92f8478a9ef /indra/newview/llnavigationbar.cpp | |
| parent | cab31b572d1a3b717b7f8b9fdf2a49f0b2eb6995 (diff) | |
| parent | bbf497469c4d71d5308421f1ef06d0a2098772c8 (diff) | |
Merge with SVN viewer-2.0.0-3 branch
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
| -rw-r--r-- | indra/newview/llnavigationbar.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index c283b3a05f..69cebcfb5e 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -62,6 +62,8 @@ #include "llfavoritesbar.h" #include "llagentui.h" +#include <boost/regex.hpp> + //-- LLTeleportHistoryMenuItem ----------------------------------------------- /** @@ -300,8 +302,8 @@ void LLNavigationBar::onSearchCommit() if(!search_query.empty()) { LLSearchHistory::getInstance()->addEntry(search_query); - invokeSearch(mSearchComboBox->getValue().asString()); } + invokeSearch(search_query); } void LLNavigationBar::onTeleportHistoryMenuItemClicked(const LLSD& userdata) |