diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-05 13:31:38 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-05 13:31:38 -0800 |
| commit | b286744a368d2a492bd9a3446fb8d072bd9ee8cd (patch) | |
| tree | ec00b869367187831e097b0a406e193cb2e0832a /indra/newview/llnotificationscripthandler.cpp | |
| parent | 6ce9f3b047084a9b947f66d041645238feb4b09b (diff) | |
| parent | e26dacb374ec0fd87679aa730cf937a44bab3628 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llnotificationscripthandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationscripthandler.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp index 070af432d6..dac7a4ca3a 100644 --- a/indra/newview/llnotificationscripthandler.cpp +++ b/indra/newview/llnotificationscripthandler.cpp @@ -37,6 +37,7 @@ #include "lltoastnotifypanel.h" #include "llviewercontrol.h" #include "llviewerwindow.h" +#include "llnotificationmanager.h" using namespace LLNotificationsUI; @@ -129,7 +130,9 @@ void LLScriptHandler::onRejectToast(LLUUID& id) { LLNotificationPtr notification = LLNotifications::instance().find(id); - if(notification) + if (notification + && LLNotificationManager::getInstance()->getHandlerForNotification( + notification->getType()) == this) { LLNotifications::instance().cancel(notification); } |