Removed temporary LLCacheName::getDisplayName code

3 files changed, 58 insertions, 63 deletions

diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index d837019e11..16bfa37b0e 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -52,6 +52,62 @@ static std::string slid_from_full_name(const std::string& full_name)
 	return id;
 }
 
+static std::map<LLUUID, std::string> sDisplayNames;
+
+// JAMESDEBUG HACK temporary IDEVO code
+static std::string get_display_name(const LLUUID& id)
+{
+	if (sDisplayNames.empty())
+	{
+		LLUUID id;
+		const unsigned char miyazaki_hayao_san[]
+			= { 0xE5, 0xAE, 0xAE, 0xE5, 0xB4, 0x8E,
+				0xE9, 0xA7, 0xBF,
+				0xE3, 0x81, 0x95, 0xE3, 0x82, 0x93, '\0' };
+		id.set("27888d5f-4ddb-4df3-ad36-a1483ce0b3d9"); // miyazaki23
+		sDisplayNames[id] = (const char*)miyazaki_hayao_san;
+
+		id.set("3e5bf676-3577-c9ee-9fac-10df430015a1"); // Jim Linden
+		sDisplayNames[id] = "Jim Jenkins";
+
+		const unsigned char jose_sanchez[] =
+			{ 'J','o','s',0xC3,0xA9,' ','S','a','n','c','h','e','z', '\0' };
+		id.set("a2e76fcd-9360-4f6d-a924-938f923df11a"); // James Linden
+		sDisplayNames[id] = (const char*)jose_sanchez;
+
+		id.set("a23fff6c-80ae-4997-9253-48272fd01d3c"); // bobsmith123
+		sDisplayNames[id] = (const char*)jose_sanchez;
+
+		id.set("3f7ced39-5e38-4fdd-90f2-423560b1e6e2"); // Hamilton Linden
+		sDisplayNames[id] = "Hamilton Hitchings";
+
+		id.set("537da1e1-a89f-4f9b-9056-b1f0757ccdd0"); // Rome Linden
+		sDisplayNames[id] = "Rome Portlock";
+
+		id.set("244195d6-c9b7-4fd6-9229-c3a8b2e60e81"); // M Linden
+		sDisplayNames[id] = "Mark Kingdon";
+
+		id.set("49856302-98d4-4e32-b5e9-035e5b4e83a4"); // T Linden
+		sDisplayNames[id] = "Tom Hale";
+
+		id.set("e6ed7825-708f-4c6b-b6a7-f3fe921a9176"); // Callen Linden
+		sDisplayNames[id] = "Christina Allen";
+
+		id.set("a7f0ac18-205f-41d2-b5b4-f75f096ae511"); // Crimp Linden
+		sDisplayNames[id] = "Chris Rimple";
+	}
+
+	std::map<LLUUID,std::string>::iterator it = sDisplayNames.find(id);
+	if (it != sDisplayNames.end())
+	{
+		return it->second;
+	}
+	else
+	{
+		return std::string();
+	}
+}
+
 void LLAvatarNameCache::initClass()
 {
 }
@@ -80,8 +136,8 @@ bool LLAvatarNameCache::get(const LLUUID& agent_id, LLAvatarName *av_name)
 	{
 		av_name->mSLID = slid_from_full_name(full_name);
 
-		std::string display_name;
-		if (gCacheName->getDisplayName(agent_id, display_name))
+		std::string display_name = get_display_name(agent_id);
+		if (!display_name.empty())
 		{
 			av_name->mDisplayName = display_name;
 		}
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index 4b0cc299c7..4e3c3630ab 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -528,62 +528,7 @@ BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
 	return res;
 }
 
-static std::map<LLUUID, std::string> sDisplayNames;
 
-bool LLCacheName::getDisplayName(const LLUUID& id, std::string& display_name)
-{
-	if (sDisplayNames.empty())
-	{
-		LLUUID id;
-		const unsigned char miyazaki_hayao_san[]
-			= { 0xE5, 0xAE, 0xAE, 0xE5, 0xB4, 0x8E,
-				0xE9, 0xA7, 0xBF,
-				0xE3, 0x81, 0x95, 0xE3, 0x82, 0x93, '\0' };
-		id.set("27888d5f-4ddb-4df3-ad36-a1483ce0b3d9"); // miyazaki23
-		sDisplayNames[id] = (const char*)miyazaki_hayao_san;
-
-		id.set("3e5bf676-3577-c9ee-9fac-10df430015a1"); // Jim Linden
-		sDisplayNames[id] = "Jim Jenkins";
-
-		const unsigned char jose_sanchez[] =
-			{ 'J','o','s',0xC3,0xA9,' ','S','a','n','c','h','e','z', '\0' };
-		id.set("a2e76fcd-9360-4f6d-a924-938f923df11a"); // James Linden
-		sDisplayNames[id] = (const char*)jose_sanchez;
-
-		id.set("a23fff6c-80ae-4997-9253-48272fd01d3c"); // bobsmith123
-		sDisplayNames[id] = (const char*)jose_sanchez;
-
-		id.set("3f7ced39-5e38-4fdd-90f2-423560b1e6e2"); // Hamilton Linden
-		sDisplayNames[id] = "Hamilton Hitchings";
-
-		id.set("537da1e1-a89f-4f9b-9056-b1f0757ccdd0"); // Rome Linden
-		sDisplayNames[id] = "Rome Portlock";
-
-		id.set("244195d6-c9b7-4fd6-9229-c3a8b2e60e81"); // M Linden
-		sDisplayNames[id] = "Mark Kingdon";
-
-		id.set("49856302-98d4-4e32-b5e9-035e5b4e83a4"); // T Linden
-		sDisplayNames[id] = "Tom Hale";
-
-		id.set("e6ed7825-708f-4c6b-b6a7-f3fe921a9176"); // Callen Linden
-		sDisplayNames[id] = "Christina Allen";
-
-		id.set("a7f0ac18-205f-41d2-b5b4-f75f096ae511"); // Crimp Linden
-		sDisplayNames[id] = "Chris Rimple";
-	}
-
-	std::map<LLUUID,std::string>::iterator it = sDisplayNames.find(id);
-	if (it != sDisplayNames.end())
-	{
-		display_name = it->second;
-		return true;
-	}
-	else
-	{
-		display_name = "";
-		return false;
-	}
-}
 
 BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
 {
diff --git a/indra/llmessage/llcachename.h b/indra/llmessage/llcachename.h
index 76865928d3..322ca4aa1a 100644
--- a/indra/llmessage/llcachename.h
+++ b/indra/llmessage/llcachename.h
@@ -82,12 +82,6 @@ public:
 	// Returns TRUE iff available.
 	BOOL getFullName(const LLUUID& id, std::string& full_name);
 
-	// IDEVO temporary code
-	// If available, copies display name (UTF-8) into string
-	// If not available, copies empty string
-	// Returns TRUE iff available
-	bool getDisplayName(const LLUUID& id, std::string& display_name);
-	
 	// Reverse lookup of UUID from name
 	BOOL getUUID(const std::string& first, const std::string& last, LLUUID& id);
 	BOOL getUUID(const std::string& fullname, LLUUID& id);