diff options
| author | Richard Linden <none@none> | 2010-09-17 16:06:51 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-17 16:06:51 -0700 |
| commit | 57c1845e2d7274b5cb28dc31a41a00088c2ecdda (patch) | |
| tree | 1a47f59321cf2a85b6db3b2b5b36b7baf787c7a5 /indra/newview | |
| parent | e0df544a57efed1c89c1f12ab0bc8a38911db14f (diff) | |
clear popup notifications on navigate
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llbrowsernotification.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llbrowsernotification.cpp b/indra/newview/llbrowsernotification.cpp index cc54d10944..ee19701773 100644 --- a/indra/newview/llbrowsernotification.cpp +++ b/indra/newview/llbrowsernotification.cpp @@ -29,13 +29,13 @@ #include "llnotificationhandler.h" #include "llnotifications.h" -#include "llfloatermediabrowser.h" #include "llfloaterreg.h" using namespace LLNotificationsUI; bool LLBrowserNotification::processNotification(const LLSD& notify) { + // browser notifications are currently handled directly by the LLMediaCtrl instance that spawned them return false; } diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index e59f2ddd07..9d172b7301 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -990,6 +990,7 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) case MEDIA_EVENT_NAVIGATE_BEGIN: { LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_NAVIGATE_BEGIN, url is " << self->getNavigateURI() << LL_ENDL; + hideNotification(); }; break; |