diff options
| author | palange <palange@lindenlab.com> | 2009-11-05 17:54:51 -0800 |
|---|---|---|
| committer | palange <palange@lindenlab.com> | 2009-11-05 17:54:51 -0800 |
| commit | 4ead03acd094d8418f9fe0f883e776ce8b209722 (patch) | |
| tree | 1ae53248e9a643c9f27333aabc31ff0291e59b45 /indra/newview/llnotificationscripthandler.cpp | |
| parent | ec32310c8602bf4dc69ed27e8c177cbd32c24411 (diff) | |
| parent | 81192236ac44ea500ea6ec6f8de32be11e9165ca (diff) | |
merge to viewer-2-0
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); } |