WIP Final name tag colors, fonts, show logic

1 files changed, 16 insertions, 7 deletions

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 9e56357b30..c71cb1feaa 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3069,21 +3069,30 @@ void LLVOAvatar::idleUpdateNameTagAlpha(BOOL new_name, F32 alpha)
 
 LLColor4 LLVOAvatar::getNameTagColor(bool is_friend)
 {
-	const char* color_name = "NameTagText";
+	const char* color_name;
 	if (is_friend)
 	{
 		color_name = "NameTagFriend";
 	}
-	else
+	else if (LLAvatarNameCache::useDisplayNames())
 	{
-		// IDEVO can we avoid doing this lookup repeatedly?
+		// ...color based on whether SLID "matches" a computed display
+		// name
 		LLAvatarName av_name;
-		if (LLAvatarNameCache::useDisplayNames()
-			&& LLAvatarNameCache::get(getID(), &av_name)
+		if (LLAvatarNameCache::get(getID(), &av_name)
 			&& av_name.mIsDisplayNameDefault)
-	{
-			color_name = "NameTagLegacy";
+		{
+			color_name = "NameTagMatch";
 		}
+		else
+		{
+			color_name = "NameTagMismatch";
+		}
+	}
+	else
+	{
+		// ...not using display names
+		color_name = "NameTagLegacy";
 	}
 	return LLUIColorTable::getInstance()->getColor( color_name );
 }