diff options
author | Richard Linden <none@none> | 2012-04-24 18:38:49 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-04-24 18:38:49 -0700 |
commit | 734153b6399828cff9da44707a1720ad1b7a0c6f (patch) | |
tree | 25e32f2c42391e2db4fb2f77105f84ddf78d4302 /indra | |
parent | 5955e6260e6e263fb089f7cc91c0be482cccdfb8 (diff) |
CHUI-96 FIX Cannot dismiss modal dialogs related to merchant outbox
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llfloateroutbox.cpp | 8 | ||||
-rw-r--r-- | indra/newview/llnotificationhandler.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp index 2a2b231b53..c55970ad69 100644 --- a/indra/newview/llfloateroutbox.cpp +++ b/indra/newview/llfloateroutbox.cpp @@ -58,6 +58,14 @@ bool LLNotificationsUI::LLOutboxNotification::processNotification(const LLNotifi return false; } +void LLNotificationsUI::LLOutboxNotification::onDelete(LLNotificationPtr p) +{ + LLNotificationsUI::LLSysHandler * sys_handler = dynamic_cast<LLNotificationsUI::LLSysHandler*>(LLNotifications::instance().getChannel("AlertModal").get()); + if (sys_handler) + { + sys_handler->onDelete(p); + } +} ///---------------------------------------------------------------------------- /// LLOutboxAddedObserver helper class diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h index 21f3961d18..1725d632e8 100644 --- a/indra/newview/llnotificationhandler.h +++ b/indra/newview/llnotificationhandler.h @@ -276,6 +276,7 @@ public: {} /*virtual*/ void onAdd(LLNotificationPtr p) { processNotification(p); } /*virtual*/ void onChange(LLNotificationPtr p) { processNotification(p); } + /*virtual*/ void onDelete(LLNotificationPtr p); bool processNotification(const LLNotificationPtr& p); }; |