diff options
| author | Baker Linden <baker@lindenlab.com> | 2014-03-11 16:32:23 -0700 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2014-03-11 16:32:23 -0700 |
| commit | 6137e120d1836ea37ea8f5f6723d86db94f31bd8 (patch) | |
| tree | 16341e6203400d52e89189d96206c26e899dbe44 /indra/newview/llviewermessage.cpp | |
| parent | b0c1dd4790847364ebcab1cb1d4103500f64072e (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
3.7.4. merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 267aa9532c..df5c7d5c2e 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2409,14 +2409,10 @@ 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 + // 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) - if (!gIMMgr->hasSession(session_id)) - { - // if there is not a panel for this conversation (i.e. it is a new IM conversation - // initiated by the other party) then... - send_do_not_disturb_message(msg, from_id, session_id); - } + + send_do_not_disturb_message(msg, from_id, session_id); // now store incoming IM in chat history |