diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-05 17:44:39 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-05 17:44:39 +0200 |
| commit | aa29e39a44458db51cad20eca03be406e4d249f0 (patch) | |
| tree | 777efa6ec059af0cf47c459005e903af6f5cde93 /indra/newview/llnotificationscripthandler.cpp | |
| parent | 4254d1e0f7af0f8f00033bc0edaf74ddd7a49796 (diff) | |
| parent | 49db6cd157f5da37f962aa36ab791084c202d439 (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
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); } |