diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-29 19:32:20 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-29 19:32:20 +0100 |
| commit | 1e44674f309ae28bbfad032e9461bbee40062b69 (patch) | |
| tree | b1c9e9df34912366b3020b076b0be19c024c5963 /indra/newview/llfloatersearch.cpp | |
| parent | 5e2448347c3b3d071a51a26fc71ea29c779dd7b5 (diff) | |
Backed out changeset b4c03b57a34f
Diffstat (limited to 'indra/newview/llfloatersearch.cpp')
| -rw-r--r-- | indra/newview/llfloatersearch.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index 13f2d6bc17..76caa0cf91 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) |