Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix two bugs for web search

Browse Source 
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)
This commit is contained in:
Lirusaito
2013-07-01 21:10:06 -04:00
parent e0dd871a96
commit 1de076c9c0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloatersearch.cpp
View File

@@ -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