summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-02-18 16:48:02 +0000
committerLynx Linden <lynx@lindenlab.com>2010-02-18 16:48:02 +0000
commit023bbc608d6a81c2b564a51c67a6287ad05085b3 (patch)
tree168302f40ad98b12046689126de076859978b0ae
parentb71f451b76ef65c6afc29a9da8c0f5d0b40cd720 (diff)
DEV-44136: Don't show previous search results when opening Find floater.
We now tear down the web view when we close the find floater. This means that we don't show the previous search results when performing a new search. It also makes for more efficient use of resources as we don't have a web view continually running in the background. (This is how the Help Browser currently works too.)
-rw-r--r--indra/newview/llfloatersearch.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp
index a7401fdb6f..76caa0cf91 100644
--- a/indra/newview/llfloatersearch.cpp
+++ b/indra/newview/llfloatersearch.cpp
@@ -118,11 +118,9 @@ void LLFloaterSearch::onOpen(const LLSD& key)
void LLFloaterSearch::onClose(bool app_quitting)
{
- if (! app_quitting)
- {
- // Show the blank home page ready for the next onOpen()
- mBrowser->navigateHome();
- }
+ // tear down the web view so we don't show the previous search
+ // result when the floater is opened next time
+ destroy();
}
void LLFloaterSearch::handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event)
@@ -158,11 +156,6 @@ void LLFloaterSearch::search(const LLSD &key)
return;
}
- // display the blank home page first, to clear the display of
- // any previous search results while the new results load.
- // The home page is set in floater_search.xml as start_url.
- mBrowser->navigateHome();
-
// reset the god level warning as we're sending the latest state
childHide("refresh_search");
mSearchGodLevel = gAgent.getGodLevel();