diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-29 19:32:29 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-29 19:32:29 +0100 |
| commit | 7a4174447a0762dcab2769d1401295b78c9341fd (patch) | |
| tree | b1c9e9df34912366b3020b076b0be19c024c5963 | |
| parent | 018065aad27b544b62cdaef660f7e39fce616ddf (diff) | |
| parent | 1e44674f309ae28bbfad032e9461bbee40062b69 (diff) | |
merge
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llfloatersearch.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/llfloatersearch.h | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 876da9f210..c8125c675f 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 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) diff --git a/indra/newview/llfloatersearch.h b/indra/newview/llfloatersearch.h index ba817adf7f..0a8d9bbe36 100644 --- a/indra/newview/llfloatersearch.h +++ b/indra/newview/llfloatersearch.h @@ -59,6 +59,8 @@ 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 |