diff options
author | prep <prep@lindenlab.com> | 2013-03-11 15:05:47 -0400 |
---|---|---|
committer | prep <prep@lindenlab.com> | 2013-03-11 15:05:47 -0400 |
commit | e0c9174609e2457fab7fe6d7291c6ebbd030397c (patch) | |
tree | a6f43767b2c3254e501c4ce0af628dfd159ad600 /indra/newview/llbrowsernotification.cpp | |
parent | 9514210beb1ae2ec49f1cf15e5a4f7af5ae56657 (diff) | |
parent | 207d9fd767895a3470722fb298eeef4f338e479a (diff) |
merge
Diffstat (limited to 'indra/newview/llbrowsernotification.cpp')
-rw-r--r-- | indra/newview/llbrowsernotification.cpp | 8 |
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) |