summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroupgeneral.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-28 11:36:46 -0500
committerOz Linden <oz@lindenlab.com>2011-01-28 11:36:46 -0500
commit98140b3cdcd505aabe31fcd23db7a2603c8deed3 (patch)
treeb94c39ef7afbc4a091b1e4f2f7b4b2de599831a8 /indra/newview/llpanelgroupgeneral.cpp
parent106c9124741afd50c3aaa5671743d5a939f1ad48 (diff)
parent4b354802c10e6e947a0ce0f023158e22fcd5bc4b (diff)
merge changes for storm-634
Diffstat (limited to 'indra/newview/llpanelgroupgeneral.cpp')
-rw-r--r--indra/newview/llpanelgroupgeneral.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 80df420a4e..ec340dc258 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -692,7 +692,8 @@ void LLPanelGroupGeneral::updateMembers()
LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
if (!mListVisibleMembers || !gdatap
- || !gdatap->isMemberDataComplete())
+ || !gdatap->isMemberDataComplete()
+ || gdatap->mMembers.empty())
{
return;
}