summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgrouproles.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-08 15:51:56 -0400
committerOz Linden <oz@lindenlab.com>2012-05-08 15:51:56 -0400
commit95090c5d1e857130f7266b5753d3650d02e9386c (patch)
treecff60656371883829dd7451ed4a1d3d09258b5ae /indra/newview/llpanelgrouproles.cpp
parent5bf742895d882f1d7178c2b18a347bf485877a02 (diff)
parentd6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff)
merge changes for version 3.3.1
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
-rw-r--r--indra/newview/llpanelgrouproles.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index fbe331c7ab..f825ee3215 100644
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -749,7 +749,10 @@ LLPanelGroupMembersSubTab::LLPanelGroupMembersSubTab()
LLPanelGroupMembersSubTab::~LLPanelGroupMembersSubTab()
{
- gSavedSettings.setString("GroupMembersSortOrder", mMembersList->getSortColumnName());
+ if (mMembersList)
+ {
+ gSavedSettings.setString("GroupMembersSortOrder", mMembersList->getSortColumnName());
+ }
}
BOOL LLPanelGroupMembersSubTab::postBuildSubTab(LLView* root)