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 /indra/newview/llfloatersearch.cpp | |
| parent | 489a01181da4f599eb4d0520636278be3ceac2bc (diff) | |
Backed out changeset d51528606985
(transplanted from 785883eceedc53d05807647d52608721170ccf8e)
(transplanted from 59e80ead6b226b77396983b72315dcf3da59f372)
(transplanted from 21ea9fb22a819525949cd86e5b7f6ac32fe44021)
Diffstat (limited to 'indra/newview/llfloatersearch.cpp')
| -rw-r--r-- | indra/newview/llfloatersearch.cpp | 12 |
1 files changed, 4 insertions, 8 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) |