Remove more of the "set your own tag colour" stuff.

I think this is right.

5 files changed, 7 insertions, 53 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e7de3b0..0ac7841 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1815,17 +1815,6 @@
 
   <!-- Begin: Client Name Tag -->
 
-  <key>ShowClientColor</key>
-  <map>
-    <key>Comment</key>
-    <string>Show *others* clients specific color in the name tag</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
   <key>ShowClientNameHoverTip</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 2311896..7cf6f91 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -73,7 +73,7 @@ BOOL LLPrefsAdvanced::postBuild()
         static BOOL* sShowClientNameTag = rebind_llcontrol<BOOL>("ShowClientNameTag", &gSavedSettings, true);
         childSetValue("client_name_tag_check", (*sShowClientNameTag));
         childSetValue("client_name_hover_check", gSavedSettings.getBOOL("ShowClientNameHoverTip"));
-        childSetValue("client_colors_check", gSavedSettings.getBOOL("ShowClientColor"));
+//      childSetValue("client_colors_check", gSavedSettings.getBOOL("ShowClientColor"));
         childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ShowMyClientTagToOthers"));
 
         childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
@@ -118,7 +118,7 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setBOOL("DisableTeleportScreens", childGetValue("disable_tp_screen_check"));
         gSavedSettings.setBOOL("ShowClientNameTag", childGetValue("client_name_tag_check"));
         gSavedSettings.setBOOL("ShowClientNameHoverTip", childGetValue("client_name_hover_check"));
-        gSavedSettings.setBOOL("ShowClientColor", childGetValue("client_colors_check"));
+//      gSavedSettings.setBOOL("ShowClientColor", childGetValue("client_colors_check"));
 
         gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
         gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
diff --git a/linden/indra/newview/llprefscolors.cpp b/linden/indra/newview/llprefscolors.cpp
index 9486077..ea105e7 100644
--- a/linden/indra/newview/llprefscolors.cpp
+++ b/linden/indra/newview/llprefscolors.cpp
@@ -82,9 +82,6 @@ BOOL LLPrefsColors::postBuild()
 
         getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(gSavedSettings.getColor4("EffectColor"));
 
-        static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);
-        childSetValue("client_name_color_check", (*sShowClientColor));
-
         return TRUE;
 }
 
@@ -133,17 +130,6 @@ void LLPrefsColors::updateFriendsCheck()
         getChild<LLColorSwatchCtrl>("FriendsChatColor")->setEnabled(childGetValue("HighlightFriendsChat"));
 }
 
-// static
-void LLPrefsColors::onCommitCheckClient(LLUICtrl* ctrl, void* userdata)
-{
-        LLPrefsColors* self = (LLPrefsColors*)userdata;
-        self->updateClientCheck();
-}
-
-void LLPrefsColors::updateClientCheck()
-{
-        getChild<LLColorSwatchCtrl>("client_tag_color")->setEnabled(childGetValue("client_name_color_checkt"));
-}
 
 void LLPrefsColors::cancel()
 {
@@ -195,7 +181,5 @@ void LLPrefsColors::apply()
 
         gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch"));
 
-        gSavedSettings.setBOOL("ShowClientColor", childGetValue("client_name_color_check"));
-
         refreshColors(); // member values become the official values and cancel becomes a no-op.
 }
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 3f378d4..54f4942 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3627,9 +3627,9 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                         client_color = LLColor4(0.5f,0.5f,1.0f);
                                 }
 
-                                static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);
+//                              static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);
                                 static BOOL* sShowClientNameTag = rebind_llcontrol<BOOL>("ShowClientNameTag", &gSavedSettings, true);
-                                if (*sShowClientColor)
+//                              if (*sShowClientColor)
                                 {
                                         avatar_name_color = client_color;
                                 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
index 9b55822..79b35ba 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
@@ -31,29 +31,10 @@ USE left="270" FOR TABBING OPTIONS
              enabled="true" follows="left|top" height="65" label="" left="50"
              mouse_opaque="true" name="effect_color_swatch"
              tool_tip="Click to open Color Picker" width="65" />
-  
-  
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-        font="SansSerifSmall" h_pad="0" halign="left" height="10" left="270"
-        mouse_opaque="true" name="client_tag_color_textbox" v_pad="0" width="394">
-    Client Tag Color:
-  </text>
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-80"
-       can_apply_immediately="true" color="0.79 0.44 0.88 1"
-       enabled="true" follows="left|top"
-       height="65" label="Imprudence" left_delta="30" mouse_opaque="true"
-       name="client_tag_color" width="65" />
-  <check_box bottom_delta="45" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="false"
-       label="Color client tags" left_delta="76" mouse_opaque="true"
-       name="client_name_color_check" radio_style="false" width="160" />
-  
-  
-  <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="left|top"
+
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="left|top"
        height="1" left="55" name="border" width="380" />  
-  
-  
+
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"