DN-120 "As a Viewer Developer, I want to update general preferences, so that...

DN-120 "As a Viewer Developer, I want to update general preferences, so that "Show Display Names" appears less intrusive"
DN-160 View Display Names Preference extends below border in preference

indra/newview/skins/default/xui/en/panel_preferences_general.xml

@@ -106,7 +106,7 @@
      height="15"
      layout="topleft"
      left="30"
-     top_pad="15"
+     top_pad="14"
      name="maturity_desired_prompt"
      width="200">
         I want to access content rated:
@@ -216,33 +216,42 @@
     layout="topleft"
     left="30"
     name="name_tags_textbox"
-    top_pad="15"
+    top_pad="14"
     width="400">
        Name tags:
    </text>
    <radio_group
      control_name="AvatarNameTagMode"
-     height="45"
+     height="20"
      layout="topleft"
      left="50"
+     top_pad="5" 
      name="Name_Tag_Preference">
         <radio_item
          label="Off"
          name="radio"
+         top_delta="20" 
+         layout="topleft"
+         height="16" 
+         left="0" 
          value="0"
          width="75" />
         <radio_item
          label="On"
-         left_delta="0"
+         left_pad="0"
+         layout="topleft"
+         top_delta="0" 
+         height="16" 
          name="radio2"
-		 top_pad="5"
          value="1"
          width="75" />
         <radio_item
          label="Show briefly"
-         left_delta="0"
+         left_pad="0"
          name="radio3"
-		 top_pad="5"
+         height="16"
+         layout="topleft"
+         top_delta="0"
          value="2"
          width="160" />
     </radio_group>
@@ -250,60 +259,45 @@
 	 enabled_control="AvatarNameTagMode"
      control_name="RenderNameShowSelf"
      height="16"
-     label="Show my name"
+     label="My name"
      layout="topleft"
      left="70"
      name="show_my_name_checkbox1"
-	 top_pad="4"
-     width="300" />
+	 top_pad="0"
+     width="100" />
    <check_box
-    control_name="NameTagShowFriends"
+     control_name="NameTagShowUsernames"
 	 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"
+     label="Usernames"
      layout="topleft"
-    left="250"
-    name="name_tags_textbox"
-    top="175"
-    width="200">
-       Tags show:
-   </text>
+     left_pad="70"
+     name="show_slids"
+     tool_tip="Show username, like bobsmith123"
+     top_delta="0" />
     <check_box
      control_name="NameTagShowGroupTitles"
 	 enabled_control="AvatarNameTagMode"
      height="16"
      label="Group titles"
-     left="265"
+     layout="topleft"
+     left="70"
+     width="100" 
      name="show_all_title_checkbox1"
 	 tool_tip="Show group titles, like Officer or Member"
      top_pad="5" />
-  <!--
-   <check_box
-     control_name="NameTagShowDisplayNames"
-	 enabled_control="AvatarNameTagMode"
-     height="16"
-     label="Display names"
-     left_delta="0"
-     name="show_display_names"
-	 tool_tip="Show display names, like José Sanchez"
-     top_pad="5" />
-     -->
+
    <check_box
-     control_name="NameTagShowUsernames"
+    control_name="NameTagShowFriends"
 	 enabled_control="AvatarNameTagMode"
      height="16"
-     label="Usernames"
-     left_delta="0"
-     name="show_slids"
-     tool_tip="Show username, like bobsmith123"
-     top_pad="2" />
+    label="Highlight friends"
+     layout="topleft"
+    left_pad="70"
+    name="show_friends"
+    tool_tip="Highlight the name tags of your friends"
+    top_delta="0" />
+
     <text
      type="string"
      length="1"
@@ -312,7 +306,7 @@
      layout="topleft"
      left="30"
      name="effects_color_textbox"
-     top="290"
+     top_pad="9"
      width="200">
         My effects:
     </text>
@@ -374,6 +368,17 @@
      name="item4"
      value="0" />
   </combo_box>
+  <check_box
+control_name="UseDisplayNames"
+follows="top|left"
+height="14"
+label="View Display Names"
+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="20"/>
     <text
      type="string"
      length="1"
@@ -383,7 +388,7 @@
      left="30"
      mouse_opaque="false"
      name="text_box3"
-     top_pad="15"
+     top_pad="10"
      width="240">
        Busy mode response:
     </text>

indra/newview/skins/default/xui/en/panel_preferences_setup.xml

@@ -115,7 +115,7 @@
    layout="topleft"
    left="77"
    name="connection_port_enabled"
-   top_pad="15"
+   top_pad="20"
    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="10"
+   top_pad="20"
    width="200">
     Cache size
   </text>
@@ -195,7 +195,6 @@
    control_name="CacheLocationTopFolder"
    border_style="line"
    border_thickness="1"
-   enabled="false"
    follows="left|top"
    font="SansSerif"
    height="23"
@@ -387,27 +386,4 @@
    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="View 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>