diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-03 20:44:00 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-03 20:44:00 -0700 |
| commit | 7c7cc56b037f05f148a7215d0c5f567989a0c012 (patch) | |
| tree | 11afb3864d36de63ccd2b1dffa7ba2daebd82e9f /indra/newview/llparticipantlist.cpp | |
| parent | b6ad7db0d61033425a4f65270731023afe74ecce (diff) | |
| parent | 3b39ec165aa837d02bf1bf57ff8f3aab3229659c (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index b263143bd1..e199cb5776 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -676,8 +676,7 @@ void LLParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id) LLAvatarName avatar_name; bool has_name = LLAvatarNameCache::get(avatar_id, &avatar_name); participant = new LLConversationItemParticipant(!has_name ? LLTrans::getString("AvatarNameWaiting") : avatar_name.mDisplayName , avatar_id, mRootViewModel); - // Binds avatar's name update callback - LLAvatarNameCache::get(avatar_id, boost::bind(&LLConversationItemParticipant::onAvatarNameCache, participant, _2)); + participant->fetchAvatarName(); if (mAvatarList) { mAvatarList->getIDs().push_back(avatar_id); |