Improved support for toggling display names on/off

Stop pre-populated name cache because we have a web service now for lookup
Added mIsLegacy to LLAvatarName so we can colorize those name tags differently

5 files changed, 21 insertions, 61 deletions

diff --git a/indra/llcommon/llavatarname.cpp b/indra/llcommon/llavatarname.cpp
index 3b1ab4d267..3950fc3af1 100644
--- a/indra/llcommon/llavatarname.cpp
+++ b/indra/llcommon/llavatarname.cpp
@@ -38,6 +38,7 @@
 LLAvatarName::LLAvatarName()
 :	mSLID(),
 	mDisplayName(),
+	mIsLegacy(false),
 	mLastUpdate(0),
 	mBadge()
 { }
diff --git a/indra/llcommon/llavatarname.h b/indra/llcommon/llavatarname.h
index 7205eb4523..fb67c16f45 100644
--- a/indra/llcommon/llavatarname.h
+++ b/indra/llcommon/llavatarname.h
@@ -51,6 +51,10 @@ public:
 	// a display name; may duplicate their SLID.
 	std::string mDisplayName;
 
+	// If true, both display name and SLID were generated from
+	// a legacy first and last name, like "James Linden (james.linden)"
+	bool mIsLegacy;
+
 	// Names can change, so need to keep track of when name was
 	// last checked.
 	// Unix time-from-epoch seconds
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index b991638f75..cd05a80bc1 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -44,7 +44,7 @@
 
 namespace LLAvatarNameCache
 {
-	bool sUseDisplayNames = true;
+	bool sUseDisplayNames = false;
 
 	// accumulated agent IDs for next query against service
 	typedef std::set<LLUUID> ask_queue_t;
@@ -103,6 +103,7 @@ void LLAvatarNameResponder::result(const LLSD& content)
 			std::string last_name = row["last_name"].asString();
 			av_name.mDisplayName =
 				LLCacheName::buildFullName(first_name, last_name);
+			av_name.mIsLegacy = true;
 		}
 
 		LLUUID agent_id = row["agent_id"].asUUID();
@@ -136,66 +137,6 @@ void LLAvatarNameResponder::error(U32 status, const std::string& reason)
 
 void LLAvatarNameCache::initClass()
 {
-	// HACK - prepopulate the cache
-	LLAvatarName name;
-	LLUUID id;
-
-	name.mSLID = "miyazaki23";
-	const unsigned char miyazaki_hayao_san[]
-		= { 0xE5, 0xAE, 0xAE, 0xE5, 0xB4, 0x8E,
-			0xE9, 0xA7, 0xBF,
-			0xE3, 0x81, 0x95, 0xE3, 0x82, 0x93, '\0' };
-	name.mDisplayName = (const char*)miyazaki_hayao_san;
-	name.mBadge = "Person_Check";
-	sCache[LLUUID("27888d5f-4ddb-4df3-ad36-a1483ce0b3d9")] = name;
-
-	name.mSLID = "james.linden";
-	const unsigned char jose_sanchez[] =
-		{ 'J','o','s',0xC3,0xA9,' ','S','a','n','c','h','e','z', '\0' };
-	name.mDisplayName = (const char*)jose_sanchez;
-	name.mBadge = "35f217a3-f618-49cf-bbca-c86d486551a9";	// IMG_SHOT
-	sCache[LLUUID("a2e76fcd-9360-4f6d-a924-938f923df11a")] = name;
-
-	name.mSLID = "bobsmith123";
-	name.mDisplayName = (const char*)jose_sanchez;
-	name.mBadge = "";
-	sCache[LLUUID("a23fff6c-80ae-4997-9253-48272fd01d3c")] = name;
-
-	// These are served by the web service now
-	//name.mSLID = "jim.linden";
-	//name.mDisplayName = "Jim Jenkins";
-	//name.mBadge = "Person_Star";
-	//sCache[LLUUID("3e5bf676-3577-c9ee-9fac-10df430015a1")] = name;
-
-	//name.mSLID = "hamilton.linden";
-	//name.mDisplayName = "Hamilton Hitchings";
-	//name.mBadge = "Person_Star";
-	//sCache[LLUUID("3f7ced39-5e38-4fdd-90f2-423560b1e6e2")] = name;
-
-	//name.mSLID = "rome.linden";
-	//name.mDisplayName = "Rome Portlock";
-	//name.mBadge = "Person_Star";
-	//sCache[LLUUID("537da1e1-a89f-4f9b-9056-b1f0757ccdd0")] = name;
-
-	//name.mSLID = "m.linden";
-	//name.mDisplayName = "Mark Kingdon";
-	//name.mBadge = "Person_Star";
-	//sCache[LLUUID("244195d6-c9b7-4fd6-9229-c3a8b2e60e81")] = name;
-
-	//name.mSLID = "t.linden";
-	//name.mDisplayName = "Tom Hale";
-	//name.mBadge = "Person_Star";
-	//sCache[LLUUID("49856302-98d4-4e32-b5e9-035e5b4e83a4")] = name;
-
-	//name.mSLID = "callen.linden";
-	//name.mDisplayName = "Christina Allen";
-	//name.mBadge = "Person_Star";
-	//sCache[LLUUID("e6ed7825-708f-4c6b-b6a7-f3fe921a9176")] = name;
-
-	//name.mSLID = "crimp.linden";
-	//name.mDisplayName = "Chris Rimple";
-	//name.mBadge = "Person_Star";
-	//sCache[LLUUID("a7f0ac18-205f-41d2-b5b4-f75f096ae511")] = name;
 }
 
 void LLAvatarNameCache::cleanupClass()
@@ -305,6 +246,11 @@ void LLAvatarNameCache::toggleDisplayNames()
 	sUseDisplayNames = !sUseDisplayNames;
 	// flush our cache
 	sCache.clear();
+	// force re-lookups
+	if (gCacheName)
+	{
+		gCacheName->clear();
+	}
 }
 
 bool LLAvatarNameCache::useDisplayNames()
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 04809caa6f..73f292cbca 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -660,6 +660,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
 	mNameFriend(false),
 	mNameAlpha(0.f),
 	mRenderGroupTitles(sRenderGroupTitles),
+	mUseDisplayNames( LLAvatarNameCache::useDisplayNames() ),
 	mFirstTEMessageReceived( FALSE ),
 	mFirstAppearanceMessageReceived( FALSE ),
 	mCulled( FALSE ),
@@ -2695,6 +2696,13 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 		new_name = TRUE;
 	}
 
+	// IDEVO HACK to force refresh
+	if (LLAvatarNameCache::useDisplayNames() != mUseDisplayNames)
+	{
+		mUseDisplayNames = LLAvatarNameCache::useDisplayNames();
+		new_name = TRUE;
+	}
+
 	// First Calculate Alpha
 	// If alpha > 0, create mNameText if necessary, otherwise delete it
 	F32 alpha = 0.f;
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index cf3f40979b..f70c68bcba 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -831,6 +831,7 @@ private:
 	bool			mNameFriend;
 	F32				mNameAlpha;
 	BOOL      		mRenderGroupTitles;
+	bool			mUseDisplayNames; // IDEVO HACK to force refresh
 
 	//--------------------------------------------------------------------
 	// Display the name (then optionally fade it out)