livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backout FIRE-8989 to fix FIRE-11096 in group panels, FIRE-8989 doesn't seem to be an issue post-CHUI with the name cache changes

meow-7.2.2
Cinders 2013-07-23 13:25:52 -06:00
parent 5cbe5a60bb
commit 78d4b2e4a2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llpanelgroupgeneral.cpp
View File

@ -793,20 +793,20 @@ void LLPanelGroupGeneral::updateMembers()
continue;
}
// if (LLAvatarNameCache::get(mMemberProgress->first, &av_name))
if (LLAvatarNameCache::get(mMemberProgress->first, &av_name))
{
addMember(mMemberProgress->second);
}
// else
// {
// // If name is not cached, onNameCache() should be called when it is cached and add this member to list. <FS:T> CHUI Merge check this
// // *TODO : Use a callback per member, not for the panel group.
// if (mAvatarNameCacheConnection.connected())
// {
// mAvatarNameCacheConnection.disconnect();
// }
// mAvatarNameCacheConnection = LLAvatarNameCache::get(mMemberProgress->first, boost::bind(&LLPanelGroupGeneral::onNameCache, this, gdatap->getMemberVersion(), member, _2));
// }
else
{
// If name is not cached, onNameCache() should be called when it is cached and add this member to list.
// *TODO : Use a callback per member, not for the panel group.
if (mAvatarNameCacheConnection.connected())
{
mAvatarNameCacheConnection.disconnect();
}
mAvatarNameCacheConnection = LLAvatarNameCache::get(mMemberProgress->first, boost::bind(&LLPanelGroupGeneral::onNameCache, this, gdatap->getMemberVersion(), member, _2));
}
}
if (mMemberProgress == gdatap->mMembers.end())