diff options
| author | Tofu Buzzard <no-email> | 2010-10-21 11:12:36 +0100 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-10-21 11:12:36 +0100 |
| commit | d210d53504630d0da9245ecc08b6b876b2374bc7 (patch) | |
| tree | c0628cbb779a70a644fdf044fb4fdb4a49ab4547 | |
| parent | 489a01181da4f599eb4d0520636278be3ceac2bc (diff) | |
Backed out changeset d51528606985
(transplanted from 785883eceedc53d05807647d52608721170ccf8e)
(transplanted from 59e80ead6b226b77396983b72315dcf3da59f372)
(transplanted from 21ea9fb22a819525949cd86e5b7f6ac32fe44021)
| -rw-r--r-- | indra/newview/llfloatersearch.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/llfloatersearch.h | 2 |
2 files changed, 4 insertions, 10 deletions
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) diff --git a/indra/newview/llfloatersearch.h b/indra/newview/llfloatersearch.h index ba4dc4c0fa..615c099d0d 100644 --- a/indra/newview/llfloatersearch.h +++ b/indra/newview/llfloatersearch.h @@ -53,8 +53,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 |