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

[GroupBan] [MAINT-3810] Viewer crash when inviting nearby agents via right click 

- Fixed an issue where residents would be unable to be invited to a group.
- Fixed a crash when trying to invite a resident to a group via right-click menu
Baker Linden 2014-04-04 12:30:01 -07:00
parent aef1cc0576
commit 29ef25f7ba
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llpanelgroupbulk.cpp
View File

@ -299,14 +299,10 @@ void LLPanelGroupBulk::updateGroupName()
void LLPanelGroupBulk::updateGroupData()
{
LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mImplementation->mGroupID);
if(!gdatap)
if(gdatap && gdatap->isGroupPropertiesDataComplete())
{
LL_WARNS("Groups") << "Unable to get group data for group " << mImplementation->mGroupID << LL_ENDL;
return;
}
if(gdatap->isGroupPropertiesDataComplete())
mPendingGroupPropertiesUpdate = false;
}
else
{
if(!mPendingGroupPropertiesUpdate)
@ -316,8 +312,10 @@ void LLPanelGroupBulk::updateGroupData()
}
}
if(gdatap->isRoleDataComplete())
if(gdatap && gdatap->isRoleDataComplete())
{
mPendingRoleDataUpdate = false;
}
else
{
if(!mPendingRoleDataUpdate)
@ -327,8 +325,10 @@ void LLPanelGroupBulk::updateGroupData()
}
}
if(gdatap->isMemberDataComplete())
if(gdatap && gdatap->isMemberDataComplete())
{
mPendingMemberDataUpdate = false;
}
else
{
if(!mPendingMemberDataUpdate)

1
indra/newview/llpanelgrouproles.cpp
View File

@ -1015,7 +1015,6 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
if (role_id.notNull() && (count > 0))
{
can_eject_members = FALSE;
can_ban_members = FALSE;
if (role_id == gdatap->mOwnerRole)
{
member_is_owner = TRUE;