From 1de076c9c0ced9bce9bca2b9d2970438d95ef0ea Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Mon, 1 Jul 2013 21:10:06 -0400 Subject: [PATCH] Fix two bugs for web search 1. When web search was open, because it had no id, it would steal the links clicked for the in-viewer browser, now it identifies as search and will not. 2. Work around an oddity with the browser being unresponsive to certain category only slurls, by temporarily removing the expected behavior of it returning as last seen when reopened (no setVisible(false) in onClose, just close out as normal) --- indra/newview/llfloatersearch.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index 6aa2d1ecc..b9cf179d2 100755 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -109,6 +109,7 @@ LLFloaterSearch::_Params::_Params() changeDefault(trusted_content, true); changeDefault(allow_address_entry, false); changeDefault(window_class, "search"); // Don't include this in the count with "web_content" + changeDefault(id, "search"); // Don't include this in the count with "web_content" } LLFloaterSearch::LLFloaterSearch(const Params& key) : @@ -193,11 +194,11 @@ void LLFloaterSearch::showInstance(const SearchQuery& search, bool web) void LLFloaterSearch::onClose(bool app_quitting) { - if (!app_quitting) // Singu Note: Copy the behavior of the legacy search singleton retaining last search when reopened + /*if (!app_quitting) // Singu Note: Copy the behavior of the legacy search singleton retaining last search when reopened { setVisible(false); return; - } + }*/ LLFloaterWebContent::onClose(app_quitting); // tear down the web view so we don't show the previous search // result when the floater is opened next time