diff options
| author | Baker Linden <baker@lindenlab.com> | 2014-03-11 16:19:49 -0700 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2014-03-11 16:19:49 -0700 |
| commit | b0c1dd4790847364ebcab1cb1d4103500f64072e (patch) | |
| tree | 9a6363c254bf11162f1ccc7bbad668d44101c40f /indra/newview/llpanelgrouproles.cpp | |
| parent | 910b40c12062181fd6d5d82d169c29632c95c830 (diff) | |
- Added null checks in a couple places.
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
| -rwxr-xr-x | indra/newview/llpanelgrouproles.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index 06932a7ec5..b1ea8b7e57 100755 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -1903,6 +1903,12 @@ bool LLPanelGroupRolesSubTab::needsApply(std::string& mesg) lldebugs << "LLPanelGroupRolesSubTab::needsApply()" << llendl; LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID); + if(!gdatap) + { + llwarns << "Unable to get group data for group " << mGroupID << llendl; + return; + } + return (mHasRoleChange // Text changed in current role || (gdatap && gdatap->pendingRoleChanges())); // Pending role changes in the group |