From 57c1845e2d7274b5cb28dc31a41a00088c2ecdda Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 17 Sep 2010 16:06:51 -0700
Subject: [PATCH] clear popup notifications on navigate
---
indra/newview/llbrowsernotification.cpp | 2 +-
indra/newview/llmediactrl.cpp | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llbrowsernotification.cpp b/indra/newview/llbrowsernotification.cpp
index cc54d10944d..ee197017738 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 e59f2ddd077..9d172b7301d 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;
--
GitLab