From c2aa0e535b8eb0322cb66d3494f3c19fa9e45a1e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 25 Jan 2014 15:23:17 +0100 Subject: [PATCH] Synchronize llviewermessage.cpp with official V3 version --- indra/newview/llviewermessage.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index d47f385eb0..31ee0cfb61 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2786,15 +2786,15 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) && ((is_do_not_disturb && (!is_muted || (is_muted && !is_autorespond_muted))) || (is_autorespond && !is_muted) || (is_autorespond_nonfriends && !is_friend && !is_muted) || (FSSendAwayAvatarResponse && is_afk && !is_muted)) - && from_id.notNull() - && to_id.notNull() + && from_id.notNull() //not a system message + && to_id.notNull() //not global message && RlvActions::canReceiveIM(from_id)) // [/RLVa:KB] { // Log autoresponse notification after initial message bool has_session = true; - // return a standard "busy" 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)) { @@ -2956,7 +2956,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL; // bool mute_im = is_muted; -// if(accept_im_from_only_friend&&!is_friend) +// if(accept_im_from_only_friend && !is_friend && !is_linden) // { // if (!gIMMgr->isNonFriendSessionNotified(session_id)) // {