diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 61d5ee63e..ed644163c 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -609,6 +609,17 @@ bool LLAvatarNameCache::get(const LLUUID& agent_id, LLAvatarName *av_name)
 			
 			return true;
 		}
+		else if (!hasNameLookupURL())
+		{
+			std::string full_name;
+			if (gCacheName->getFullName(agent_id, full_name))
+			{
+				LLAvatarName av_name;
+				av_name.fromString(full_name);
+				sCache[agent_id] = av_name;
+				return true;
+			}
+		}
 	}
 
 	if (!isRequestPending(agent_id))
@@ -666,6 +677,18 @@ 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))
+			{
+				LLAvatarName av_name;
+				av_name.fromString(full_name);
+				sCache[agent_id] = av_name;
+				fireSignal(agent_id, slot, av_name);
+				return connection;
+			}
+		}
 	}
 
 	// schedule a request