Backed out changeset d51528606985

(transplanted from 785883eceedc53d05807647d52608721170ccf8e)
(transplanted from 59e80ead6b226b77396983b72315dcf3da59f372)
(transplanted from 21ea9fb22a819525949cd86e5b7f6ac32fe44021)

indra/newview/llfloatersearch.cpp

@@ -103,14 +103,10 @@ BOOL LLFloaterSearch::postBuild()
 
 void LLFloaterSearch::onOpen(const LLSD& key)
 {
-	search(key);
-}
-
-void LLFloaterSearch::onClose(bool app_quitting)
-{
-	// tear down the web view so we don't show the previous search
-	// result when the floater is opened next time
-	destroy();
+	if ( (key.has("category")) || ((mBrowser) && (mBrowser->getCurrentNavUrl().empty())) )
+	{
+		search(key);
+	}
 }
 
 void LLFloaterSearch::handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event)

indra/newview/llfloatersearch.h

@@ -53,8 +53,6 @@ class LLFloaterSearch :
 	/// see search() for details on the key parameter.
 	/*virtual*/ void onOpen(const LLSD& key);
 
-	/*virtual*/ void onClose(bool app_quitting);
-
 	/// perform a search with the specific search term.
 	/// The key should be a map that can contain the following keys:
 	///  - "id": specifies the text phrase to search for