From 20cea3b0f97c8c24ede5e8ec86dd426e7b1c9e34 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 16 Sep 2010 14:15:32 -0700
Subject: As a resident, when I elect to see friends names in green, it should
 also colour their group tags so that the name tags don't look like crap. 
 This also applies to status message - Away/Busy in nametag

---
 indra/newview/llvoavatar.cpp           | 8 ++------
 indra/newview/skins/default/colors.xml | 9 ---------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 9dc49169df..a4efacdca9 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2952,20 +2952,16 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
 			}
 			// trim last ", "
 			line.resize( line.length() - 2 );
-			LLColor4 status_color =
-				LLUIColorTable::getInstance()->getColor("NameTagStatus");
-			addNameTagLine(line, status_color, LLFontGL::NORMAL,
+			addNameTagLine(line, name_tag_color, LLFontGL::NORMAL,
 				LLFontGL::getFontSansSerifSmall());
 		}
 
 		if (sRenderGroupTitles
 			&& title && title->getString() && title->getString()[0] != '\0')
 						{
-			LLColor4 group_color =
-				LLUIColorTable::getInstance()->getColor("NameTagGroup");
 			std::string title_str = title->getString();
 			LLStringFn::replace_ascii_controlchars(title_str,LL_UNKNOWN_CHAR);
-			addNameTagLine(title_str, group_color, LLFontGL::NORMAL,
+			addNameTagLine(title_str, name_tag_color, LLFontGL::NORMAL,
 				LLFontGL::getFontSansSerifSmall());
 						}
 
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 3bca881310..ddd2ff196b 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -545,9 +545,6 @@
     <color
      name="NameTagFriend"
      value="0.447 0.784 0.663 1" />
-    <color
-     name="NameTagGroup"
-     value="1 1 1 1" />
     <color
      name="NameTagLegacy"
      reference="White" />
@@ -557,12 +554,6 @@
     <color
      name="NameTagMismatch"
      reference="White" />
-    <color
-     name="NameTagSLID"
-     value="1 1 1 1" />
-    <color
-     name="NameTagStatus"
-     value="1 1 1 1" />
     <color
      name="NetMapBackgroundColor"
      value="0 0 0 1" />
-- 
cgit v1.2.3