From a179f950571b338738c6cf53feed15abbe86641d Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 10 Oct 2013 04:08:01 -0400 Subject: [PATCH] [LLIMMgr/LLIMPanel Revision] Clean up ignored groups logic --- indra/newview/llimview.cpp | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 0fcf96747..b5a68fa1c 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -450,29 +450,9 @@ void LLIMMgr::addMessage( // create IM window as necessary if(!floater) { - if (gIMMgr->getIgnoreGroupListCount() > 0 && gAgent.isInGroup(session_id)) - { - // Check to see if we're blocking this group's chat - LLGroupData* group_data = NULL; - - // Search for this group in the agent's groups list - LLDynamicArray::iterator i; - - for (i = gAgent.mGroups.begin(); i != gAgent.mGroups.end(); i++) - { - if (i->mID == session_id) - { - group_data = &*i; - break; - } - } - - // If the group is in our list then return - if (group_data && gIMMgr->getIgnoreGroup(group_data->mID)) - { - return; - } - } + // Return now if we're blocking this group's chat + if (getIgnoreGroup(session_id) && gAgent.isInGroup(session_id)) + return; std::string name = from; if(!session_name.empty() && session_name.size()>1)