diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-01 18:04:33 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-01 18:04:33 -0800 |
| commit | 7705b43889a6cc2c718077906c8dd778b0e877f8 (patch) | |
| tree | 03248dd2cb5957e9a85d8a7099cf7a19ffdd8699 /indra/newview/llnotificationscripthandler.cpp | |
| parent | 142833f93f54cfe5127785e58a44cfec855178dc (diff) | |
CHUI-691: Now when an estate message is received while in DND mode, a toast notification will appear.
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()); |