From 5e2448347c3b3d071a51a26fc71ea29c779dd7b5 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 29 Jul 2010 12:50:25 +0100
Subject: [PATCH] WEB-1819 FIXED Find always resets to start page (plus many
dupes).
Enough seesawing, I hope - see WEB-1819 for discussion and the nature of the compromise.
Patch by Kitty Barnett, reviewed by my.
---
doc/contributions.txt | 1 +
indra/newview/llfloatersearch.cpp | 12 ++++--------
indra/newview/llfloatersearch.h | 2 --
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index c8125c675fb..876da9f2100 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -329,6 +329,7 @@ Khyota Wulluf
VWR-9966
Kitty Barnett
VWR-19699
+ WEB-1819
Kunnis Basiat
VWR-82
VWR-102
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp
index 76caa0cf919..13f2d6bc177 100644
--- a/indra/newview/llfloatersearch.cpp
+++ b/indra/newview/llfloatersearch.cpp
@@ -113,14 +113,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)
diff --git a/indra/newview/llfloatersearch.h b/indra/newview/llfloatersearch.h
index 0a8d9bbe369..ba817adf7f0 100644
--- a/indra/newview/llfloatersearch.h
+++ b/indra/newview/llfloatersearch.h
@@ -59,8 +59,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
--
GitLab