diff options
| author | simon <none@none> | 2013-11-25 09:17:29 -0800 |
|---|---|---|
| committer | simon <none@none> | 2013-11-25 09:17:29 -0800 |
| commit | 5756b7b3d05ce330e9877650ba6af04aaa4da49d (patch) | |
| tree | a1668748b931f0b0a9bd2df80aa24b1c156e8f9e /indra/newview/llviewermessage.cpp | |
| parent | f1be57cd30489902e44d7843703a39987f379c69 (diff) | |
| parent | 1ae4d45337b380213112183f153a631d4c3f3289 (diff) | |
Merge - doh!
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 3574d37adf..dd744be4eb 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2408,14 +2408,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 |