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

reimport changset 14913 to fix the display name issue in IM and group chat 

http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/ead2e91b6da2
meow-7.2.2
Tank_Master 2011-06-13 21:46:30 -07:00
parent 47a23447d3
commit 91837db170
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llmessage/llavatarnamecache.cpp
View File

@ -676,14 +676,24 @@ void LLAvatarNameCache::get(const LLUUID& agent_id, callback_slot_t slot)
std::map<LLUUID,LLAvatarName>::iterator it = sCache.find(agent_id);
if (it != sCache.end())
{
const LLAvatarName& av_name = it->second;
LLAvatarName& av_name = it->second;
//AO: this is broken, it comes up as expired prematurely.
//disable the expire test as a temp workaround.
/*
if (av_name.mExpires > LLFrameTimer::getTotalSeconds())
{
*/
// ...name already exists in cache, fire callback now
fireSignal(agent_id, slot, av_name);
llinfos << "AO: namelookup cache hit: " << agent_id << llendl;
return;
/*
}
else
llinfos << "AO: namelookup expired, re-requesting: " << agent_id << llendl;
*/
}
}
else