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

CHUI-366 : Completed : Update participants names when the display name pref is toggled on and off.

meow-7.2.2
Merov Linden 2012-09-28 15:08:56 -07:00
parent 0651e10aff
commit 166ff2b1b8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llimfloatercontainer.cpp
View File

@ -350,7 +350,13 @@ void LLIMFloaterContainer::processParticipantsStyleUpdate()
LLUUID participant_id = participant_model->getUUID();
LLAvatarName av_name;
LLAvatarNameCache::get(participant_id,&av_name);
participant_model->onAvatarNameCache(av_name);
// Avoid updating the model though if the cache is still waiting for its first update
if (!av_name.mDisplayName.empty())
{
participant_model->onAvatarNameCache(av_name);
}
// Bind update to the next cache name signal
LLAvatarNameCache::get(participant_id, boost::bind(&LLConversationItemParticipant::onAvatarNameCache, participant_model, _2));
// Next participant
current_participant_model++;
}
@ -368,7 +374,6 @@ void LLIMFloaterContainer::idle(void* user_data)
{
self->setNearbyDistances();
}
self->mConversationsRoot->update();
}