From 12e4a0fd752ee306d68febe9c480b1c42ac85df5 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 18 Mar 2014 19:32:31 +0100 Subject: [PATCH] Undo MAINT-3275 and send "do not disturb" message only once and if session does not already exist --- indra/newview/llviewermessage.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 995396a078..e63b341f04 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2768,7 +2768,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // 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) - + // Old "do not disturb" message behavior: only send once if session not open + if (!gIMMgr->hasSession(session_id)) + { + // // Log autoresponse notification after initial message has_session = false; @@ -2808,6 +2811,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) session_id); gAgent.sendReliableMessage(); // FS autoresponse feature + // Old "do not disturb" message behavior: only send once if session not open + } + // // checkfor and process reqinfo if (has_session)