From 8d8ed10f4dcef7b2de363c09bb085048847dcb46 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 4 Jul 2014 14:15:13 +0200 Subject: [PATCH] FIRE-13613: First group IM received that was initiated by a muted resident leads to leaving the group chat session --- indra/newview/llimview.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 793c31a744..440454e9ca 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2999,6 +2999,16 @@ void LLIMMgr::addMessage( } // + // FIRE-13613: First group IM received that was initiated by a muted + // resident leads to leaving the group chat session + if (IM_NOTHING_SPECIAL != dialog && IM_SESSION_P2P_INVITE != dialog && + gAgent.isInGroup(new_session_id) && LLMuteList::getInstance()->isMuted(other_participant_id) && !from_linden) + { + LL_INFOS() << "Ignoring group chat initiated by muted resident." << LL_ENDL; + return; + } + // + LLIMModel::getInstance()->newSession(new_session_id, fixed_session_name, dialog, other_participant_id, false, is_offline_msg); LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(new_session_id);