From d822206a48633e03f7456663d7d7d82b73ba209f Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 19 May 2010 10:25:52 -0700
Subject: [PATCH] Remove colors for match/mismatch/friends from name tags
Product team request. Reviewed with Leyla
---
indra/newview/app_settings/settings.xml | 11 +++++++++++
indra/newview/llvoavatar.cpp | 5 +++--
indra/newview/skins/default/colors.xml | 2 +-
.../default/xui/en/panel_preferences_general.xml | 11 ++++++++++-
4 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6e7d8510722..acd3c10ec63 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7337,6 +7337,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>NameTagShowFriends</key>
+ <map>
+ <key>Comment</key>
+ <string>Highlight the name tags of your friends</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>NameTagShowUsernames</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 40e1f316979..a9250991f6f 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3072,14 +3072,15 @@ void LLVOAvatar::idleUpdateNameTagAlpha(BOOL new_name, F32 alpha)
LLColor4 LLVOAvatar::getNameTagColor(bool is_friend)
{
+ static LLUICachedControl<bool> show_friends("NameTagShowFriends");
const char* color_name;
- if (is_friend)
+ if (show_friends && is_friend)
{
color_name = "NameTagFriend";
}
else if (LLAvatarNameCache::useDisplayNames())
{
- // ...color based on whether SLID "matches" a computed display
+ // ...color based on whether username "matches" a computed display
// name
LLAvatarName av_name;
if (LLAvatarNameCache::get(getID(), &av_name)
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index bb43de6ada1..bfa57892a7f 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -550,7 +550,7 @@
reference="White" />
<color
name="NameTagMismatch"
- value="1 0.776 0.212 1" />
+ reference="White" />
<color
name="NameTagSLID"
value="1 1 1 1" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 5f50b962ee9..eabbdc21864 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -256,7 +256,16 @@
name="show_my_name_checkbox1"
top_pad="4"
width="300" />
- <text
+ <check_box
+ control_name="NameTagShowFriends"
+ enabled_control="AvatarNameTagMode"
+ height="16"
+ label="Highlight friends"
+ left_delta="0"
+ name="show_friends"
+ tool_tip="Highlight the name tags of your friends"
+ top_pad="2" />
+ <text
follows="left|top"
height="15"
layout="topleft"
--
GitLab