Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix

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();