Second Life viewer sources 1.15.1.3

1 files changed, 14 insertions, 9 deletions

diff --git a/linden/indra/newview/llpanelgrouproles.cpp b/linden/indra/newview/llpanelgrouproles.cpp
index 266ff12..5765a12 100644
--- a/linden/indra/newview/llpanelgrouproles.cpp
+++ b/linden/indra/newview/llpanelgrouproles.cpp
@@ -1323,13 +1323,17 @@ void LLPanelGroupMembersSubTab::onRoleCheck(LLUICtrl* ctrl, void* user_data)
         LLCheckBoxCtrl* check_box = static_cast<LLCheckBoxCtrl*>(ctrl);
         if (!check_box || !self) return;
 
-
-        LLUUID role_id = self->mAssignedRolesList->getFirstSelected()->getUUID();
-        LLRoleMemberChangeType change_type = (check_box->get() ? 
-                                                                                  RMC_ADD : 
-                                                                                  RMC_REMOVE);
-
-        self->handleRoleCheck(role_id, change_type);
+        LLScrollListItem* first_selected =
+                self->mAssignedRolesList->getFirstSelected();
+        if (first_selected)
+        {
+                LLUUID role_id = first_selected->getUUID();
+                LLRoleMemberChangeType change_type = (check_box->get() ? 
+                                                      RMC_ADD : 
+                                                      RMC_REMOVE);
+                
+                self->handleRoleCheck(role_id, change_type);
+        }
 }
 
 void LLPanelGroupMembersSubTab::handleMemberDoubleClick()
@@ -2056,8 +2060,9 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc)
         }
 
         if ((GC_ROLE_MEMBER_DATA == gc || GC_MEMBER_DATA == gc)
-                && gdatap->isMemberDataComplete()
-                && gdatap->isRoleMemberDataComplete())
+            && gdatap
+            && gdatap->isMemberDataComplete()
+            && gdatap->isRoleMemberDataComplete())
         {
                 buildMembersList();
         }