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

MAINT-5758 FIXED "Ban Member" from the group chatters list context menu 

is greyed out once you have performed a ban, until you load the group
members list from group info.
meow-7.2.2
AndreyL ProductEngine 2015-10-27 14:04:25 +02:00
parent 7f39e2583f
commit eccafc5c40
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llfloaterimcontainer.cpp
View File

@ -1925,19 +1925,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;
}
}
}
}

2
indra/newview/llgroupmgr.cpp
View File

@ -772,7 +772,7 @@ void LLGroupMgrGroupData::banMemberById(const LLUUID& participant_uuid)
mPendingBanRequest = true;
mPendingBanMemberID = participant_uuid;
if (!mMemberDataComplete)
if (!mMemberDataComplete || !mMembers.size())
{
LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mID);
}