summaryrefslogtreecommitdiff
path: root/indra/newview/llbrowsernotification.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-09-16 16:29:53 -0700
committerRichard Linden <none@none>2010-09-16 16:29:53 -0700
commitd2a0327b6e89ca678e50e58dd685ea80e4c51cb5 (patch)
tree99a6b0958cbb10af7044e8f26f9253e87d89e9bb /indra/newview/llbrowsernotification.cpp
parentb24071ca8936035ff42cb361e42cac63593f695e (diff)
popup blocking notifications now handled in all web_browser instances, not just llfloatermediabrowser
Diffstat (limited to 'indra/newview/llbrowsernotification.cpp')
-rw-r--r--indra/newview/llbrowsernotification.cpp18
1 files changed, 1 insertions, 17 deletions
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;
}