diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-04 19:29:56 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-04 19:29:56 -0800 |
| commit | 5d8c9902767ec5a81b002694d5520a29f3af03fe (patch) | |
| tree | f89441a75977d2bc3eb078d3ab8c91253569b9f7 /indra | |
| parent | 6a68f16f2e908838b89216543b36f07e2a71c360 (diff) | |
| parent | cfb8d6abcbefad02b7297dc1d513fb3395a8da26 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llnotificationscripthandler.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 7 |
2 files changed, 8 insertions, 3 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()); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 359819ec49..6bbfd30794 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2371,7 +2371,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) LLNotification::Params params; switch(dialog) - { + { case IM_CONSOLE_AND_CHAT_HISTORY: args["MESSAGE"] = message; payload["from_id"] = from_id; @@ -2391,7 +2391,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // do nothing -- don't distract newbies in // Prelude with global IMs } - else if (offline == IM_ONLINE && is_do_not_disturb && from_id.notNull()) + else if (offline == IM_ONLINE + && is_do_not_disturb + && from_id.notNull() //not a system message + && to_id.notNull()) //not global message { // return a standard "do not disturb" message, but only do it to online IM // (i.e. not other auto responses and not store-and-forward IM) |