Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix

1 files changed, 109 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
new file mode 100644
index 0000000000..7aa8e23e76
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ center_horiz="true"
+ center_vert="true"
+ default_tab_group="1"
+ height="460"
+ layout="topleft"
+ name="Preferences"
+ help_topic="preferences"
+ single_instance="true"
+ title="PREFERENCES"
+ width="620">
+    <button
+     follows="right|bottom"
+     height="23"
+     label="OK"
+     label_selected="OK"
+     layout="topleft"
+     right="-105"
+     name="OK"
+     top="433"
+     width="90">
+        <button.commit_callback
+         function="Pref.OK" />
+    </button>
+    <button
+     follows="right|bottom"
+     height="23"
+     label="Cancel"
+     label_selected="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="Cancel"
+     right="-10"
+     width="90" >
+        <button.commit_callback
+         function="Pref.Cancel" />
+    </button>
+    <tab_container
+     follows="all"
+     height="410"
+     layout="topleft"
+     left="0"
+     name="pref core"
+     tab_group="1"
+     tab_position="left"
+     tab_width="115"
+     top="21"
+     width="620">
+        <panel
+	 class="panel_preference"
+         filename="panel_preferences_general.xml"
+         label="General"
+         layout="topleft"
+         help_topic="preferences_general_tab"
+         name="general" />
+        <panel
+	 class="panel_preference_graphics"
+         filename="panel_preferences_graphics1.xml"
+         label="Graphics"
+         layout="topleft"
+         help_topic="preferences_display_tab"
+         name="display" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_privacy.xml"
+         label="Privacy"
+         layout="topleft"
+         help_topic="preferences_im_tab"
+         name="im" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_sound.xml"
+         label="Sound &amp; Media"
+         layout="topleft"
+         help_topic="preferences_audio_tab"
+         name="audio" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_chat.xml"
+         label="Chat"
+         layout="topleft"
+         help_topic="preferences_chat_tab"
+         name="chat" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_alerts.xml"
+         label="Notifications"
+         layout="topleft"
+         help_topic="preferences_msgs_tab"
+         name="msgs" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_setup.xml"
+         label="Setup"
+         layout="topleft"
+         help_topic="preferences_input_tab"
+         name="input" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_advanced.xml"
+         label="Advanced"
+         layout="topleft"
+         help_topic="preferences_advanced1_tab"
+         name="advanced1" />
+    </tab_container>
+
+</floater>