diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-06 19:59:57 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-06 19:59:57 +0200 |
| commit | 9b0404c4b5c99be3ab3591c7677f95f987056795 (patch) | |
| tree | 3c5c5f99004673533b860e17442a07b955aa6fb0 /indra/newview/llnotificationscripthandler.cpp | |
| parent | 3781615afa6db7289f26f404885ac614c7f1cee0 (diff) | |
| parent | 418b0334f2ee92ce8b8958218c8d6db5ccc855f2 (diff) | |
merge
Diffstat (limited to 'indra/newview/llnotificationscripthandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationscripthandler.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp index 19dd6d4ca0..08c98e4f28 100644 --- a/indra/newview/llnotificationscripthandler.cpp +++ b/indra/newview/llnotificationscripthandler.cpp @@ -98,7 +98,9 @@ bool LLScriptHandler::processNotification(const LLNotificationPtr& notification) p.on_delete_toast = boost::bind(&LLScriptHandler::onDeleteToast, this, _1); if(gAgent.isDoNotDisturb()) { - p.force_show = notification->getName() == "SystemMessage" || notification->getPriority() >= NOTIFICATION_PRIORITY_HIGH; + p.force_show = notification->getName() == "SystemMessage" + || notification->getName() == "GodMessage" + || notification->getPriority() >= NOTIFICATION_PRIORITY_HIGH; } LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get()); |