From 91837db17067819cd1cd1ee039b347fc0aab21da Mon Sep 17 00:00:00 2001 From: Tank_Master Date: Mon, 13 Jun 2011 21:46:30 -0700 Subject: [PATCH] reimport changset 14913 to fix the display name issue in IM and group chat http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/ead2e91b6da2 --- indra/llmessage/llavatarnamecache.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index d3890844b6..0d3a3f1201 100644 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -676,14 +676,24 @@ void LLAvatarNameCache::get(const LLUUID& agent_id, callback_slot_t slot) std::map::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