diff options
author | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:48:30 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:48:30 -0400 |
commit | df3e6b40fd80a139e745106231bc5c752271beea (patch) | |
tree | c52227a2428060c5f3ffd7a1f97725c45adedb3a /indra/newview/llviewermessage.cpp | |
parent | 8192a3c5b2addd63e1d5c12269eec7e6de2adde0 (diff) | |
parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) |
merge changes for 3.7.12-release
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-x | indra/newview/llviewermessage.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index e70bf87d0e..332d04a1f4 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2461,10 +2461,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) && 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) - - send_do_not_disturb_message(msg, from_id, session_id); // now store incoming IM in chat history @@ -2485,6 +2481,15 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) region_id, position, true); + + if (!gIMMgr->isDNDMessageSend(session_id)) + { + // 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) + send_do_not_disturb_message(msg, from_id, session_id); + gIMMgr->setDNDMessageSent(session_id, true); + } + } else if (from_id.isNull()) { |