summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2013-10-25 15:29:21 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2013-10-25 15:29:21 +0300
commit1088810e6460d3c722c24edc22887354450c1814 (patch)
tree8add5300915bec991dd659d8ebb43c0795cdacd1 /indra
parent00541f49d9678840e685026b495b37445522cc0c (diff)
MAINT-3275 FIXED Send DND auto response even if session already exists.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llviewermessage.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 82131c6675..5dba0640d4 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