diff options
| author | Richard Linden <none@none> | 2010-12-10 10:11:03 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-12-10 10:11:03 -0800 |
| commit | 8044661bd581fd7b6a25bd04d4c4f7e32e421faf (patch) | |
| tree | 5d4a60e2dc914d7016884a8e60fa6ea8b7a118d3 /indra/newview/llbrowsernotification.cpp | |
| parent | 61b675e0afb96d1d46b1f36a8d54bb8146ef27d6 (diff) | |
WIP XUI HTTP Auth dialog
refactored LLWindowShade into seperate file
improved layout of dialog
improved dialog resizing logic
Tab and Enter keys now work as expected in windowshade form
added "modal" capability to window shade
added HTTP Auth notifications to MOAP
Diffstat (limited to 'indra/newview/llbrowsernotification.cpp')
| -rw-r--r-- | indra/newview/llbrowsernotification.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llbrowsernotification.cpp b/indra/newview/llbrowsernotification.cpp index 633ef4f1ce..6e77d1e336 100644 --- a/indra/newview/llbrowsernotification.cpp +++ b/indra/newview/llbrowsernotification.cpp @@ -31,6 +31,7 @@ #include "llnotifications.h" #include "llmediactrl.h" #include "llviewermedia.h" +#include "llviewermediafocus.h" using namespace LLNotificationsUI; @@ -39,10 +40,19 @@ bool LLBrowserNotification::processNotification(const LLSD& notify) LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID()); if (!notification) return false; - LLMediaCtrl* media_instance = LLMediaCtrl::getInstance(notification->getPayload()["media_id"].asUUID()); + LLUUID media_id = notification->getPayload()["media_id"].asUUID(); + LLMediaCtrl* media_instance = LLMediaCtrl::getInstance(media_id); if (media_instance) { media_instance->showNotification(notification); } + else if (LLViewerMediaFocus::instance().getControlsMediaID() == media_id) + { + LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(media_id); + if (impl) + { + impl->showNotification(notification); + } + } return false; } |
