diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-04 14:43:20 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-04 14:43:20 -0800 |
| commit | e5c593682af3a4958316d7747d39f41e2a65e88c (patch) | |
| tree | 2c62627da1b826a4df17e5173cb5b1a8fd5ada5f /indra/newview/llnotificationscripthandler.cpp | |
| parent | 3e73b107d37e293b4e4cde91734e1e8251ba6b72 (diff) | |
| parent | 2f6ffe2183250f3f71a8d502eed9cf9df9ff8b16 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llnotificationscripthandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationscripthandler.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp index e2d4e9f8ce..19dd6d4ca0 100644 --- a/indra/newview/llnotificationscripthandler.cpp +++ b/indra/newview/llnotificationscripthandler.cpp @@ -27,6 +27,7 @@ #include "llviewerprecompiledheaders.h" // must be first include +#include "llagent.h" #include "llnotificationhandler.h" #include "lltoastnotifypanel.h" #include "llviewercontrol.h" @@ -95,6 +96,10 @@ bool LLScriptHandler::processNotification(const LLNotificationPtr& notification) p.notification = notification; p.panel = notify_box; p.on_delete_toast = boost::bind(&LLScriptHandler::onDeleteToast, this, _1); + if(gAgent.isDoNotDisturb()) + { + p.force_show = notification->getName() == "SystemMessage" || notification->getPriority() >= NOTIFICATION_PRIORITY_HIGH; + } LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get()); if(channel) |