From efa00298b3e806a92ced61803b2bbe8ca40d1681 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 17 May 2010 17:11:27 -0700
Subject: updated preferences placement for display names option reviewed by
 James

---
 .../default/xui/en/panel_preferences_advanced.xml  | 15 ++----------
 .../default/xui/en/panel_preferences_setup.xml     | 27 ++++++++++++++++++++--
 2 files changed, 27 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index e3ee14771c..88b60ea3c8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -205,7 +205,7 @@ Automatic position for:
    layout="topleft"
    left="30"
    name="UI Size:"
-   top_pad="5"
+   top_pad="15"
    width="300">
     UI size
   </text>
@@ -316,21 +316,10 @@ Automatic position for:
  label="Other Devices"
  left="30"
  name="joystick_setup_button"
- top_pad="5"
+ top_pad="10"
  width="155">
     <button.commit_callback
      function="Floater.Show"
      parameter="pref_joystick" />
   </button>
-  <check_box
-  control_name="UseDisplayNames" 
-  follows="top|left"
-  height="15"
-  label="Use Display Names (PLACEHOLDER)"
-  layout="topleft" 
-  left="30"
-  name="display_names_check"
-  width="237"
-  tool_tip="Check to use display names in chat, IM, name tags, etc."
-  top_pad="5"/> 
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 2c6ceeef2e..7148aba00a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -115,7 +115,7 @@
    layout="topleft"
    left="77"
    name="connection_port_enabled"
-   top_pad="20"
+   top_pad="15"
    width="256">
     <check_box.commit_callback
      function="Notification.Show"
@@ -147,7 +147,7 @@
    left="80"
    mouse_opaque="false"
    name="cache_size_label_l"
-   top_pad="20"
+   top_pad="10"
    width="200">
     Cache size
   </text>
@@ -375,4 +375,27 @@
    name="web_proxy_port"
    top_delta="0"
    width="145" />
+  <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="10"
+       layout="topleft"
+       left="30"
+       name="Communications:"
+       top_pad="5"
+       width="300">
+    Communications:
+  </text>
+  <check_box
+control_name="UseDisplayNames"
+follows="top|left"
+height="15"
+label="Use Display Names"
+layout="topleft"
+left_delta="50"
+name="display_names_check"
+width="237"
+tool_tip="Check to use display names in chat, IM, name tags, etc."
+top_pad="10"/>
 </panel>
-- 
cgit v1.2.3