2 files changed, 6 insertions, 0 deletions

diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index efb8a27..6558d7b 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -49,6 +49,7 @@ BOOL LLPrefsAdvanced::postBuild()
 {
         childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens"));
         childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens"));
+        childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ShowClientNameTag"));
 
         return TRUE;
 }
@@ -57,6 +58,7 @@ void LLPrefsAdvanced::apply()
 {
         gSavedSettings.setBOOL("DisableLoginLogoutScreens", childGetValue("disable_log_screen_check"));
         gSavedSettings.setBOOL("DisableTeleportScreens", childGetValue("disable_tp_screen_check"));
+        gSavedSettings.setBOOL("ShowClientNameTag", childGetValue("client_name_tag_check"));
 }
 
 void LLPrefsAdvanced::cancel()
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 ba02942..417097d 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
@@ -11,4 +11,8 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Disable Teleport Screens" left="12" mouse_opaque="true"
              name="disable_tp_screen_check" radio_style="false" width="217" />
+  <check_box bottom_delta="-25" enabled="true" follows="left|top"
+     font="SansSerifSmall" height="16" initial_value="false"
+     label="Show Client Names in Name Tag" left="12" mouse_opaque="true"
+     name="client_name_tag_check" radio_style="false" width="217" />
 </panel>