merge changes for 4.0.1-release

1 files changed, 10 insertions, 12 deletions

diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index f1a6ef78a6..15b67b905d 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1916,19 +1916,17 @@ bool LLFloaterIMContainer::canBanSelectedMember(const LLUUID& participant_uuid)
 
 	if (gdatap->isRoleMemberDataComplete())
 	{
-		if (!gdatap->mMembers.size())
-		{
-			return false;
-		}
-
-		LLGroupMgrGroupData::member_list_t::iterator mi = gdatap->mMembers.find((participant_uuid));
-		if (mi != gdatap->mMembers.end())
-		{
-			LLGroupMemberData* member_data = (*mi).second;
-			// Is the member an owner?
-			if (member_data && member_data->isInRole(gdatap->mOwnerRole))
+		if (gdatap->mMembers.size())
+		{			
+			LLGroupMgrGroupData::member_list_t::iterator mi = gdatap->mMembers.find((participant_uuid));
+			if (mi != gdatap->mMembers.end())
 			{
-				return false;
+				LLGroupMemberData* member_data = (*mi).second;
+				// Is the member an owner?
+				if (member_data && member_data->isInRole(gdatap->mOwnerRole))
+				{
+					return false;
+				}
 			}
 		}
 	}