diff options
author | Oz Linden <oz@lindenlab.com> | 2011-08-04 15:39:33 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-08-04 15:39:33 -0400 |
commit | f42df4cd9fe8eb9e4a778dc9e5fdf94b4d6cfb59 (patch) | |
tree | 837c1eebc58b227f7049ee857fa6bd8fbbd25121 /indra/newview/llnavigationbar.cpp | |
parent | 94c171d89bae06d0bc259255a917db892019c369 (diff) | |
parent | 0b81c19cbe809f041e628da334c305ea33fae2e9 (diff) |
merge changes for storm-1538
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 b8832dfd8e..9d54ad7463 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -716,7 +716,7 @@ void LLNavigationBar::handleLoginComplete() void LLNavigationBar::invokeSearch(std::string search_text) { - LLFloaterReg::showInstance("search", LLSD().with("category", "all").with("id", LLSD(search_text))); + LLFloaterReg::showInstance("search", LLSD().with("category", "all").with("query", LLSD(search_text))); } void LLNavigationBar::clearHistoryCache() |