summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2014-07-16 02:16:48 +0300
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2014-07-16 02:16:48 +0300
commit0f22bcdff029ba7c420ec04ce992251ab1d4be6f (patch)
treeb290b36eb72c03fe0f8c1c3511839c266751640e /indra/newview
parentb4df05d21af49ab7195b77d44fb0e53b070e79bd (diff)
MAINT-4263 FIXED Viewer crashes after right click on group in Conversations.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llfloaterimcontainer.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 8ebe268d81..be8195b5ee 100755
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1868,13 +1868,24 @@ bool LLFloaterIMContainer::canBanSelectedMember(const LLUUID& participant_uuid)
return false;
}
+ if (!gdatap->mMembers.size())
+ {
+ return false;
+ }
+
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;
}
+
if( gAgent.hasPowerInGroup(group_uuid, GP_ROLE_REMOVE_MEMBER) &&
gAgent.hasPowerInGroup(group_uuid, GP_GROUP_BAN_ACCESS) )
{