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

[OpenSim] Remove unneeded code from the previous name resolution fixes

Browse Source
This commit is contained in:
Inusaito Sayori
2015-01-09 15:57:24 -05:00
parent 05a4409b3d
commit 05fcfc32bc
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/llmessage/llavatarnamecache.cpp
View File

@@ -121,13 +121,6 @@ namespace LLAvatarNameCache
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);
@@ -684,16 +677,6 @@ LLAvatarNameCache::callback_connection_t LLAvatarNameCache::get(const LLUUID& ag
return connection; return connection;
} }
} }
else if (!hasNameLookupURL())
{
std::string full_name;
if (gCacheName->getFullName(agent_id, full_name))
{
resolveNameLegacy(agent_id, full_name, slot);
return connection;
}
return gCacheName->get(agent_id, false, boost::bind(resolveNameLegacy, _1, _2, slot));
}
} }
// schedule a request // schedule a request