Added "Show client name tag colors" checkbox in Preferences > Advanced.

That checkbox was removed from Preferences > Colors in the previous
commit (87219855).

2 files changed, 9 insertions, 4 deletions

diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 087acc9..2311896 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -73,6 +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_name_tag_broadcast_check", gSavedSettings.getBOOL("ShowMyClientTagToOthers"));
 
         childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
@@ -117,6 +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("AppearanceAnimate", childGetValue("appearance_anim_check"));
         gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
@@ -332,4 +334,3 @@ void LLPrefsAdvanced::onSaveAnyoneCloudButton(void * data)
         std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml");
         LLVOAvatar::saveCloud(filename, LLVOAvatar::sCloud);
 }
-
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 8585a8e..b6deee9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -74,7 +74,7 @@ USE left="270" FOR TABBING OPTIONS
       
       <check_box bottom_delta="-25" enabled="true" follows="left|top"
           font="SansSerifSmall" height="16" initial_value="false"
-          label="Show client names in nametags" left_delta="30" mouse_opaque="true"
+          label="Show client names in nametags" left="50" mouse_opaque="true"
           name="client_name_tag_check" radio_style="false" width="160" />
       <check_box bottom_delta="0" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
@@ -82,12 +82,16 @@ USE left="270" FOR TABBING OPTIONS
            name="client_name_hover_check" radio_style="false" width="160" />
       <check_box bottom_delta="-18" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
-           label="Show your client name to others" left="50" mouse_opaque="true"
+           label="Show client name tag colors" left="50" mouse_opaque="true"
+           name="client_colors_check" radio_style="false" width="160" />
+      <check_box bottom_delta="0" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show your client name to others" left="270" mouse_opaque="true"
            name="client_name_tag_broadcast_check" radio_style="false" width="217" />
       <check_box bottom_delta="-18" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
            tool_tip="Toggle editing animation and standing up when entering appearance mode"
-           label="Animate avatar when editing appearance" left_delta="0" mouse_opaque="true"
+           label="Animate avatar when editing appearance" left="50" mouse_opaque="true"
            name="appearance_anim_check" radio_style="false" width="217" />
       <check_box bottom_delta="-18" control_name="HeadFollowsMouse" enabled="true"
            follows="left|top" font="SansSerifSmall" height="16"