merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3

ignore-dead-branch

1 files changed, 153 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..ba28016d8e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ center_horiz="true"
+ center_vert="true"
+ default_tab_group="1"
+ height="460"
+ layout="topleft"
+ name="Preferences"
+ single_instance="true"
+ title="Preferences"
+ width="620">
+    <button
+     follows="right|bottom"
+     height="20"
+     label="OK"
+     label_selected="OK"
+     layout="topleft"
+     left="335"
+     name="OK"
+     top="435"
+     width="90">
+        <button.commit_callback
+         function="Pref.OK" />
+    </button>
+    <button
+     follows="right|bottom"
+     height="20"
+     label="Cancel"
+     label_selected="Cancel"
+     layout="topleft"
+     left_pad="3"
+     name="Cancel"
+     top_delta="0"
+     width="90" >
+        <button.commit_callback
+         function="Pref.Cancel" />
+    </button>
+    <button
+     follows="right|bottom"
+     height="20"
+     label="Apply"
+     label_selected="Apply"
+     layout="topleft"
+     left_pad="3"
+     name="Apply"
+     top_delta="0"
+     width="90">
+        <button.commit_callback
+         function="Pref.Apply" />
+    </button>
+    <button
+     follows="left|bottom"
+     height="20"
+     label="About"
+     label_selected="About"
+     layout="topleft"
+     left_delta="-512"
+     name="About..."
+     top_delta="0"
+     width="90">
+        <button.commit_callback
+         function="Floater.Show"
+         parameter="sl_about" />
+    </button>
+    <button
+     follows="left|bottom"
+     height="20"
+     help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417"
+     label="Help"
+     label_selected="Help"
+     layout="topleft"
+     left_pad="3"
+     name="Help"
+     top_delta="0"
+     width="90" />
+    <tab_container
+     follows="left|top|right|bottom"
+     height="410"
+     layout="topleft"
+     left="0"
+     name="pref core"
+     tab_group="1"
+     tab_position="left"
+     tab_width="120"
+     top="21"
+     width="620">
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_general.xml"
+         label="General"
+         layout="topleft"
+         name="general" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_input.xml"
+         label="Input &amp; Camera"
+         layout="topleft"
+         name="input" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_network.xml"
+         label="Network"
+         layout="topleft"
+         name="network" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_web.xml"
+         label="Web"
+         layout="topleft"
+         name="web" />
+        <panel
+         filename="panel_preferences_graphics1.xml"
+         label="Graphics"
+         layout="topleft"
+         name="display" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_audio.xml"
+         label="Audio &amp; Video"
+         layout="topleft"
+         name="audio" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_chat.xml"
+         label="Text Chat"
+         layout="topleft"
+         name="chat" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_voice.xml"
+         label="Voice Chat"
+         layout="topleft"
+         name="voice" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_im.xml"
+         label="Communication"
+         layout="topleft"
+         name="im" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_popups.xml"
+         label="Popups"
+         layout="topleft"
+         name="msgs" />
+        <panel
+		 class="panel_preference"
+         filename="panel_preferences_skins.xml"
+         label="Skins"
+         layout="topleft"
+         name="skins" />
+    </tab_container>
+</floater>