summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-29 12:50:25 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-29 12:50:25 +0100
commit5e2448347c3b3d071a51a26fc71ea29c779dd7b5 (patch)
tree5dac26842453d54b426dfcb332d69bed55c01741 /indra/newview
parent4a41273078da14463fe86fe9abf2a2d8946d910e (diff)
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.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatersearch.cpp12
-rw-r--r--indra/newview/llfloatersearch.h2
2 files changed, 4 insertions, 10 deletions
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp
index 76caa0cf91..13f2d6bc17 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 0a8d9bbe36..ba817adf7f 100644
--- a/indra/newview/llfloatersearch.h
+++ b/indra/newview/llfloatersearch.h
@@ -59,8 +59,6 @@ public:
/// 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