diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-28 15:59:12 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-28 15:59:12 -0700 |
| commit | 3f7e04c6f7a214218b1bd6140b30879370ee5f1b (patch) | |
| tree | 88d4ee4211bf166538ba46edacdb06912a249c93 /indra/newview | |
| parent | d9512f70050730409026fbd43c8ca24ff13fa7bb (diff) | |
| parent | bf32cf1a62a8fb0d898977738972d7be14ebe028 (diff) | |
STORM-322 : merge with viewer-development
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelgrouproles.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index 0d1d96eae6..d1362d7922 100644 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -1576,6 +1576,7 @@ void LLPanelGroupMembersSubTab::update(LLGroupChange gc) void LLPanelGroupMembersSubTab::addMemberToList(LLUUID id, LLGroupMemberData* data) { + if (!data) return; LLUIString donated = getString("donation_area"); donated.setArg("[AREA]", llformat("%d", data->getContribution())); @@ -1616,9 +1617,12 @@ void LLPanelGroupMembersSubTab::onNameCache(const LLUUID& update_id, const LLUUI std::string fullname; gCacheName->getFullName(id, fullname); - if (matchesSearchFilter(fullname)) + + LLGroupMemberData* data; + // trying to avoid unnecessary hash lookups + if (matchesSearchFilter(fullname) && ((data = gdatap->mMembers[id]) != NULL)) { - addMemberToList(id, gdatap->mMembers[id]); + addMemberToList(id, data); if(!mMembersList->getEnabled()) { mMembersList->setEnabled(TRUE); |