[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

2 files changed, 8 insertions, 9 deletions

diff --git a/indra/newview/llpanelgroupbulk.cpp b/indra/newview/llpanelgroupbulk.cpp
index 86ac1867df..9d02b9b45a 100644
--- a/indra/newview/llpanelgroupbulk.cpp
+++ b/indra/newview/llpanelgroupbulk.cpp
@@ -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)
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 5093207c50..881779ca67 100755
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -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;