From d2a0327b6e89ca678e50e58dd685ea80e4c51cb5 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 16 Sep 2010 16:29:53 -0700
Subject: popup blocking notifications now handled in all web_browser
 instances, not just llfloatermediabrowser

---
 indra/newview/llbrowsernotification.cpp | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'indra/newview/llbrowsernotification.cpp')

diff --git a/indra/newview/llbrowsernotification.cpp b/indra/newview/llbrowsernotification.cpp
index e162527e23..cc54d10944 100644
--- a/indra/newview/llbrowsernotification.cpp
+++ b/indra/newview/llbrowsernotification.cpp
@@ -36,22 +36,6 @@ using namespace LLNotificationsUI;
 
 bool LLBrowserNotification::processNotification(const LLSD& notify)
 {
-	LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID());
-
-	if (notification)
-	{
-		LLFloaterMediaBrowser* browserp = dynamic_cast<LLFloaterMediaBrowser*>(LLFloaterReg::findInstance("media_browser", notification->getPayload()["source"]));
-		if (notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "load")
-		{
-			if (browserp)
-			{
-				browserp->showNotification(notification);
-			}
-		}
-		else if (notify["sigtype"].asString() == "delete")
-		{
-			browserp->hideNotification();
-		}
-	}
+	// browser notifications are currently handled directly by the LLMediaCtrl instance that spawned them
 	return false;
 }
-- 
cgit v1.2.3