livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-13613: First group IM received that was initiated by a muted resident leads to leaving the group chat session

Ansariel 2014-07-04 14:15:13 +02:00
parent 14df289bd6
commit 8d8ed10f4d
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llimview.cpp
View File

@ -2999,6 +2999,16 @@ void LLIMMgr::addMessage(
}
// </FS:Ansariel>
// <FS:Ansariel> 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;
}
// </FS:Ansariel>
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);