From d210d53504630d0da9245ecc08b6b876b2374bc7 Mon Sep 17 00:00:00 2001
From: Tofu Buzzard <no-email>
Date: Thu, 21 Oct 2010 11:12:36 +0100
Subject: Backed out changeset d51528606985 (transplanted from
 785883eceedc53d05807647d52608721170ccf8e) (transplanted from
 59e80ead6b226b77396983b72315dcf3da59f372) (transplanted from
 21ea9fb22a819525949cd86e5b7f6ac32fe44021)

---
 indra/newview/llfloatersearch.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'indra/newview/llfloatersearch.cpp')

diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp
index 2041fac8d8..6fc9a620c1 100644
--- a/indra/newview/llfloatersearch.cpp
+++ b/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)
-- 
cgit v1.2.3