diff options
author | Richard Linden <none@none> | 2012-01-19 19:44:15 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2012-01-19 19:44:15 -0800 |
commit | 4fa9f2892b7a9967f9e97228c17e7b277fc56aae (patch) | |
tree | c7e330b71e4d5127902f9b4fc5fbeabadf021a15 /indra/newview/llpanelgrouproles.cpp | |
parent | 9de0b5ed4891dcfcb54e35d9bb0401309455d66a (diff) | |
parent | 19320842ebc39c1b528a2107323f9e918d688177 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
-rw-r--r-- | indra/newview/llpanelgrouproles.cpp | 5 |
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) |