diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index dd4f97fb1..a882bcdc9 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -120,13 +120,6 @@ namespace LLAvatarNameCache
 	void fireSignal(const LLUUID& agent_id,
 					const callback_slot_t& slot,
 					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?
 	bool isRequestPending(const LLUUID& agent_id);
@@ -684,16 +677,6 @@ LLAvatarNameCache::callback_connection_t LLAvatarNameCache::get(const LLUUID& ag
 				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