diff options
author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-05 18:43:07 +0200 |
---|---|---|
committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-05 18:43:07 +0200 |
commit | c8904ad1a35fb9c0d22423b47e2ddf9789877297 (patch) | |
tree | 21eb4b2b5e8bb7eaf4f0ec7225dac97870ea6adc /indra/newview/llnotificationscripthandler.cpp | |
parent | 8c042fde4f1103a44cbd50e15c7221d46db82288 (diff) | |
parent | 8ada3c0a532ae8e2742244f5f1ec5bae6081c73f (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); } |