From 1e44674f309ae28bbfad032e9461bbee40062b69 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 29 Jul 2010 19:32:20 +0100
Subject: [PATCH] Backed out changeset b4c03b57a34f
---
doc/contributions.txt | 1 -
indra/newview/llfloatersearch.cpp | 12 ++++++++----
indra/newview/llfloatersearch.h | 2 ++
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 876da9f2100..c8125c675fb 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -329,7 +329,6 @@ 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 13f2d6bc177..76caa0cf919 100644
--- a/indra/newview/llfloatersearch.cpp
+++ b/indra/newview/llfloatersearch.cpp
@@ -113,10 +113,14 @@ BOOL LLFloaterSearch::postBuild()
void LLFloaterSearch::onOpen(const LLSD& key)
{
- if ( (key.has("category")) || ((mBrowser) && (mBrowser->getCurrentNavUrl().empty())) )
- {
- search(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();
}
void LLFloaterSearch::handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event)
diff --git a/indra/newview/llfloatersearch.h b/indra/newview/llfloatersearch.h
index ba817adf7f0..0a8d9bbe369 100644
--- a/indra/newview/llfloatersearch.h
+++ b/indra/newview/llfloatersearch.h
@@ -59,6 +59,8 @@ 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