summaryrefslogtreecommitdiff
path: root/indra/newview/llbrowsernotification.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2013-03-25 11:12:52 -0700
committersimon <none@none>2013-03-25 11:12:52 -0700
commit98a82c50d539451e1931826ca75fbc01d611806d (patch)
tree3c3dcac20286246f0724c11f126233702f0bdaaf /indra/newview/llbrowsernotification.cpp
parent94ae64d6fd30e4dbc3280cd277f772c038ccd9fe (diff)
parent515f0e5a559ff3f0cb7d02e1d40b0f71425800ea (diff)
Pull in downstream CHUI code from viewer-development
Diffstat (limited to 'indra/newview/llbrowsernotification.cpp')
-rw-r--r--indra/newview/llbrowsernotification.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llbrowsernotification.cpp b/indra/newview/llbrowsernotification.cpp
index 6e77d1e336..19747757db 100644
--- a/indra/newview/llbrowsernotification.cpp
+++ b/indra/newview/llbrowsernotification.cpp
@@ -35,11 +35,13 @@
using namespace LLNotificationsUI;
-bool LLBrowserNotification::processNotification(const LLSD& notify)
+LLBrowserNotification::LLBrowserNotification()
+ : LLSystemNotificationHandler("Browser", "browser")
{
- LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID());
- if (!notification) return false;
+}
+bool LLBrowserNotification::processNotification(const LLNotificationPtr& notification)
+{
LLUUID media_id = notification->getPayload()["media_id"].asUUID();
LLMediaCtrl* media_instance = LLMediaCtrl::getInstance(media_id);
if (media_instance)