Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[OpenSim] Properly fix name lookups, oops~

Browse Source
This commit is contained in:
Inusaito Sayori
2015-01-07 19:02:28 -05:00
parent f09d399e88
commit 5d47c7ecfa
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/llmessage/llavatarnamecache.cpp
View File

@@ -120,6 +120,13 @@ namespace LLAvatarNameCache
void fireSignal(const LLUUID& agent_id, void fireSignal(const LLUUID& agent_id,
const callback_slot_t& slot, const callback_slot_t& slot,
const LLAvatarName& av_name); const LLAvatarName& av_name);
void resolveNameLegacy(const LLUUID& id, const std::string& name, const callback_slot_t& slot)
{
LLAvatarName av_name;
av_name.fromString(name);
fireSignal(id, slot, sCache[id] = av_name);
}
// Is a request in-flight over the network? // Is a request in-flight over the network?
bool isRequestPending(const LLUUID& agent_id); bool isRequestPending(const LLUUID& agent_id);
@@ -682,12 +689,10 @@ LLAvatarNameCache::callback_connection_t LLAvatarNameCache::get(const LLUUID& ag
std::string full_name; std::string full_name;
if (gCacheName->getFullName(agent_id, full_name)) if (gCacheName->getFullName(agent_id, full_name))
{ {
LLAvatarName av_name; resolveNameLegacy(agent_id, full_name, slot);
av_name.fromString(full_name);
sCache[agent_id] = av_name;
fireSignal(agent_id, slot, av_name);
return connection; return connection;
} }
return gCacheName->get(agent_id, false, boost::bind(resolveNameLegacy, _1, _2, slot));
} }
} }