1 files changed, 15 insertions, 21 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index cf9e3a82fc..d182cdc6bb 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ legacy_header_height="18"
  center_horiz="true"
  center_vert="true"
  default_tab_group="1"
@@ -8,36 +9,36 @@
  name="Preferences"
  help_topic="preferences"
  single_instance="true"
- title="Preferences"
+ title="PREFERENCES"
  width="620">
     <button
      follows="right|bottom"
-     height="20"
+     height="23"
      label="OK"
      label_selected="OK"
      layout="topleft"
-     left="427"
+     right="-105"
      name="OK"
-     top="435"
+     top="433"
      width="90">
         <button.commit_callback
          function="Pref.OK" />
     </button>
     <button
      follows="right|bottom"
-     height="20"
+     height="23"
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
-     left_pad="3"
+     left_pad="5"
      name="Cancel"
-     top_delta="0"
+     right="-10"
      width="90" >
         <button.commit_callback
          function="Pref.Cancel" />
     </button>
     <tab_container
-     follows="left|top|right|bottom"
+     follows="all"
      height="410"
      layout="topleft"
      left="0"
@@ -48,14 +49,14 @@
      top="21"
      width="620">
         <panel
-		 class="panel_preference"
+	 class="panel_preference"
          filename="panel_preferences_general.xml"
          label="General"
          layout="topleft"
          help_topic="preferences_general_tab"
          name="general" />
         <panel
-		 class="panel_preference"
+	 class="panel_preference"
          filename="panel_preferences_graphics1.xml"
          label="Graphics"
          layout="topleft"
@@ -63,14 +64,14 @@
          name="display" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_im.xml"
+         filename="panel_preferences_privacy.xml"
          label="Privacy"
          layout="topleft"
          help_topic="preferences_im_tab"
          name="im" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_audio.xml"
+         filename="panel_preferences_sound.xml"
          label="Sound"
          layout="topleft"
          help_topic="preferences_audio_tab"
@@ -84,14 +85,14 @@
          name="chat" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_popups.xml"
+         filename="panel_preferences_alerts.xml"
          label="Alerts"
          layout="topleft"
          help_topic="preferences_msgs_tab"
          name="msgs" />
         <panel
 		 class="panel_preference"
-         filename="panel_preferences_input.xml"
+         filename="panel_preferences_setup.xml"
          label="Setup"
          layout="topleft"
          help_topic="preferences_input_tab"
@@ -103,13 +104,6 @@
          layout="topleft"
          help_topic="preferences_advanced1_tab"
          name="advanced1" />
-        <panel
-		 class="panel_preference"
-         filename="panel_preferences_advanced2.xml"
-         label="Move or Kill"
-         layout="topleft"
-         help_topic="preferences_advanced2_tab"
-         name="advanced2" />
     </tab_container>
 
 </floater>