diff options
author | James Cook <james@lindenlab.com> | 2010-01-04 12:57:31 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2010-01-04 12:57:31 -0800 |
commit | 1355d16d2f24f9d623df70059b1f0001cf673209 (patch) | |
tree | ce50b243817d8acb42306bca85813e2a61e8b278 /indra/newview/llfloatersearch.cpp | |
parent | ba9a4f80b5bd97ca3b6bd1fa01ddf1c23698a569 (diff) | |
parent | 6157187e5bdff889613673f11852d9c25f96bf92 (diff) |
Merge, bringing in a few viewer-2-0 bug fixes
Diffstat (limited to 'indra/newview/llfloatersearch.cpp')
-rw-r--r-- | indra/newview/llfloatersearch.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index 595d84f9f0..c6d9fee630 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -77,6 +77,15 @@ void LLFloaterSearch::onOpen(const LLSD& key) search(key); } +void LLFloaterSearch::onClose(bool app_quitting) +{ + if (! app_quitting) + { + // Show the blank home page ready for the next onOpen() + mBrowser->navigateHome(); + } +} + void LLFloaterSearch::handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event) { switch (event) @@ -110,6 +119,11 @@ void LLFloaterSearch::search(const LLSD &key) return; } + // display the blank home page first, to clear the display of + // any previous search results while the new results load. + // The home page is set in floater_search.xml as start_url. + mBrowser->navigateHome(); + // reset the god level warning as we're sending the latest state childHide("refresh_search"); mSearchGodLevel = gAgent.getGodLevel(); |