Rename Preferences panel file names

EXT-1734

4 files changed, 676 insertions, 4 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..285045f2c8 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -63,14 +63,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 +84,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"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
new file mode 100644
index 0000000000..159323538c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ height="500"
+ label="Popups"
+ layout="topleft"
+ left="0"
+ name="popups"
+ top="500"
+ width="517">
+    <text
+     type="string"
+     length="1"
+     follows="top|left"
+     height="12"
+     layout="topleft"
+     left="30"
+     name="tell_me_label"
+     top="10"
+     width="300">
+        Tell me:
+    </text>
+    <check_box
+     control_name="NotifyMoneyChange"
+     height="16"
+     label="When I spend or get L$"
+     layout="topleft"
+     left_delta="50"
+     name="notify_money_change_checkbox"
+     top_pad="4"
+     width="300" />
+    <check_box
+     control_name="ChatOnlineNotification"
+	 enabled="false"
+     height="16"
+     label="When my friends log out or in"
+     layout="topleft"
+     left_delta="0"
+     name="friends_online_notify_checkbox"
+     top_pad="4"
+     width="300" />
+    <text
+     type="string"
+     length="1"
+     follows="top|left"
+     font="SansSerifBold"
+     height="12"
+     layout="topleft"
+     left="30"
+     name="show_label"
+     top_pad="14"
+     width="450">
+        Always show these alerts:
+    </text>
+    <scroll_list
+     follows="top|left"
+     height="92"
+     layout="topleft"
+     left="10"
+     multi_select="true" 
+     name="enabled_popups"
+     width="475" />
+	 <button
+	 enabled_control="FirstSelectedDisabledPopups"
+     follows="top|left"
+     height="20"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_overlay="Arrow_Up"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     hover_glow_amount="0.15"
+     layout="topleft"
+     left_delta="137"
+     name="enable_this_popup"
+     picture_style="true"
+     top_pad="10"
+     width="43">
+        <button.commit_callback
+         function="Pref.ClickEnablePopup" />
+    </button>
+    <button
+	 enabled_control="FirstSelectedEnabledPopups"
+	 follows="top|left"
+     height="20"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Disabled"
+     image_overlay="Arrow_Down"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     hover_glow_amount="0.15"
+     layout="topleft"
+     left_pad="50"
+     name="disable_this_popup"
+     picture_style="true"
+     top_delta="0"
+     width="43">
+        <button.commit_callback
+         function="Pref.ClickDisablePopup" />
+    </button>
+    <text
+     type="string"
+     length="1"
+     follows="top|left"
+     font="SansSerifBold"
+     height="12"
+     layout="topleft"
+     left="30"
+     name="dont_show_label"
+     top_pad="10"
+     width="450">
+        Never show these alerts:
+    </text>
+    <scroll_list
+     follows="top|left"
+     height="92"
+     layout="topleft"
+     left="10"
+     multi_select="true" 
+     name="disabled_popups"
+     width="475" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
new file mode 100644
index 0000000000..c4dc8834db
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="left|top|right|bottom"
+ height="408"
+ label="Communication"
+ layout="topleft"
+ left="102"
+ name="im"
+ top="1"
+ width="517">
+    <panel.string
+     name="log_in_to_change">
+        log in to change
+    </panel.string>
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Clear History"
+     layout="topleft"
+     left="30"
+     name="clear_cache"
+     top="10"
+     width="145">
+        <button.commit_callback
+         function="Pref.WebClearCache" />
+    </button>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="10"
+     mouse_opaque="false"
+     name="cache_size_label_l"
+     top_delta="3"
+     text_color="LtGray_50"
+     width="300">
+       (Locations, images, web, search history)
+    </text>
+    <check_box
+	 height="16"
+	 enabled="false"
+     label="Only friends and groups know I'm online"
+     layout="topleft"
+     left="30"
+     name="online_visibility"
+     top_pad="20"
+     width="350" />
+    <check_box
+     enabled_control="EnableVoiceChat"
+     control_name="VoiceCallsFriendsOnly"
+     height="16"
+     label="Only friends and groups can call or IM me"
+     layout="topleft"
+     left="30"
+     name="voice_call_friends_only_check"
+     top_pad="10"
+     width="350" />
+    <check_box
+     enabled_control="EnableVoiceChat"
+     control_name="AutoDisengageMic"
+     height="16"
+     label="Switch off microphone when ending calls"
+     layout="topleft"
+     left="30"
+     name="auto_disengage_mic_check"
+     top_pad="10"
+     width="350" />
+    <check_box
+     control_name="CookiesEnabled"
+     height="16"
+     label="Accept cookies"
+     layout="topleft"
+     left="30"
+     name="cookies_enabled"
+     top_pad="10"
+     width="350" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     mouse_opaque="false"
+     top_pad="10"
+     width="350">
+        Logs:
+    </text>    
+    <check_box
+	 enabled="false"
+     control_name="LogInstantMessages"
+     height="16"
+     label="Save logs on my computer"
+     layout="topleft"
+     left="30"
+     name="log_instant_messages"
+     top_pad="10"
+     width="350">
+        <check_box.commit_callback
+         function="Pref.Logging" />
+    </check_box>
+   <radio_group
+     control_name="IMLogOptions"
+     enabled="false"
+     height="80"
+     layout="topleft"
+     left_delta="50"
+     name="ChatIMLogs"
+     width="350"
+     top_pad="0">
+        <radio_item
+         height="16"
+         label="Chat"
+         layout="topleft"
+         left="0"
+         name="radio1"
+         top="3"
+         width="200" />
+        <radio_item
+         height="16"
+         label="IM"
+         layout="topleft"
+         left_delta="0"
+         name="radio2"
+         top_pad="3"
+         width="200" />
+        <radio_item
+         height="16"
+         label="Both, together"
+         layout="topleft"
+         left_delta="0"
+         name="radio3"
+         top_pad="3"
+         width="200" />
+        <radio_item
+         height="16"
+         label="Both, separate"
+         layout="topleft"
+         left_delta="0"
+         name="radio4"
+         top_pad="3"
+         width="200" />
+    </radio_group>
+    <check_box
+     control_name="LogTimestamp"
+	 enabled="false"
+     height="16"
+     label="Add timestamp"
+     layout="topleft"
+     left_delta="0"
+     name="show_timestamps_check_im"
+     top_pad="10"
+     width="237" />
+    <line_editor
+     bottom="366"
+     control_name="InstantMessageLogFolder"
+     enabled="false"
+     follows="top|left|right"
+     halign="right"
+     height="19"
+     layout="topleft"
+     left_delta="0"
+     mouse_opaque="false"
+     name="log_path_string"
+     top_pad="5" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_delta="0"
+     mouse_opaque="false"
+     top_pad="1"
+     width="128"
+     text_color="LtGray_50">
+        Location of logs
+    </text>    
+    <button
+	 enabled="false"
+     follows="right|bottom"
+     height="20"
+     label="Browse"
+     label_selected="Browse"
+     layout="topleft"
+     left_pad="115"
+     name="log_path_button"
+     top_delta="-21"
+     width="145">
+        <button.commit_callback
+         function="Pref.LogPath" />
+    </button>
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Block List"
+     layout="topleft"
+     left="30"
+     name="block_list"
+     top_pad="20"
+     width="145">
+        <button.commit_callback
+         function="SideTray.ShowPanel"
+		 parameter="panel_block_list_sidetray" />
+    </button>
+    </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
new file mode 100644
index 0000000000..df347cfb5f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="left|top|right|bottom"
+ height="408"
+ label="Input &amp; Camera"
+ layout="topleft"
+ left="102"
+ name="Input panel"
+ top="1"
+ width="517">
+    <button
+     height="20"
+     label="Other Devices"
+     layout="topleft"
+     left="30"
+     name="joystick_setup_button"
+     top="10"
+     width="155">
+        <button.commit_callback
+         function="Floater.Show"
+         parameter="pref_joystick" />
+    </button>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="Mouselook:"
+     top_pad="10"
+     width="300">
+        Mouselook:
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_delta="50"
+     name=" Mouse Sensitivity"
+     top_pad="10"
+     width="150">
+        Mouse sensitivity
+    </text>
+    <slider
+     control_name="MouseSensitivity"
+     follows="left|top"
+     height="15"
+     initial_value="2"
+     layout="topleft"
+     show_text="false"
+     left_delta="150"
+     max_val="15"
+     name="mouse_sensitivity"
+     top_delta="0"
+     width="145" />
+    <check_box
+     control_name="InvertMouse"
+     height="16"
+     label="Invert"
+     layout="topleft"
+     left_pad="2"
+     name="invert_mouse"
+     top_delta="0"
+     width="128" />
+        <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="Network:"
+     mouse_opaque="false"
+     top_pad="4"
+     width="300">
+        Network:
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_delta="50"
+     name="Maximum bandwidth"
+     mouse_opaque="false"
+     top_pad="10"
+     width="200">
+        Maximum bandwidth
+    </text>
+    <slider
+     can_edit_text="true"
+     control_name="ThrottleBandwidthKBPS"
+     decimal_digits="0"
+     follows="left|top"
+     height="15"
+     increment="10"
+     initial_value="50"
+     layout="topleft"
+     left_delta="150"
+     max_val="1500"
+     min_val="50"
+     name="max_bandwidth"
+     top_delta="0"
+     width="180" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="6"
+     mouse_opaque="false"
+     name="text_box2"
+     top_delta="1"
+     width="200">
+        kbps
+    </text>
+    <check_box
+     control_name="ConnectionPortEnabled"
+	 height="16"
+     label="Custom port"
+     layout="topleft"
+     left="77"
+     name="connection_port_enabled"
+     top_pad="20"
+     width="256">
+        <check_box.commit_callback
+         function="Notification.Show" 
+		 parameter="ChangeConnectionPort" />
+    </check_box>
+    <spinner
+     control_name="BrowserProxyPort"
+     enabled_control="BrowserProxyEnabled"
+	 decimal_digits="0"
+     follows="left|top"
+     height="16"
+     increment="1"
+     initial_value="80"
+     label="Port Number:"
+     label_width="75"
+     layout="topleft"
+     left_delta="160"
+     max_val="12000"
+     min_val="10"
+     name="web_proxy_port"
+     top_delta="-2"
+     width="140" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="80"
+     mouse_opaque="false"
+     name="cache_size_label_l"
+     top_pad="20"
+     width="200">
+        Cache size
+    </text>
+    <slider
+     can_edit_text="true"
+     control_name="CacheSize"
+     decimal_digits="0"
+     follows="left|top"
+     height="15"
+     increment="10"
+     initial_value="50"
+     layout="topleft"
+     left_delta="150"
+     max_val="1000"
+     min_val="10"
+     name="cache_size"
+     top_delta="-1"
+     width="180" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="6"
+     mouse_opaque="false"
+     name="text_box5"
+     top_delta="1"
+     width="40">
+        MB
+    </text>
+    <line_editor
+     control_name="CacheLocationTopFolder"
+     border_style="line"
+     border_thickness="1"
+     enabled="false"
+     follows="left|top"
+     font="SansSerif"
+     handle_edit_keys_directly="true"
+     height="20"
+     layout="topleft"
+     left="80"
+     max_length="4096"
+     name="cache_location"
+     top_pad="20"
+     width="205" />
+    <button
+     follows="left|top"
+     height="22"
+     label="Browse"
+     label_selected="Browse"
+     layout="topleft"
+     left_pad="5"
+     name="set_cache"
+     top_delta="-1"
+     width="100">
+        <button.commit_callback
+         function="Pref.SetCache" />
+    </button>
+   <button
+     follows="left|top"
+     height="22"
+     label="Reset"
+     label_selected="Set"
+     layout="topleft"
+     left_pad="3"
+     name="reset_cache"
+     top_delta="0"
+     width="100">
+        <button.commit_callback
+         function="Pref.ResetCache" />
+    </button>
+
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="80"
+     name="Cache location"
+     top_delta="20"
+     width="300"
+     text_color="LtGray_50">
+        Cache location
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="Web:"
+     top_pad="5"
+     width="300">
+        Web:
+    </text>
+    <radio_group
+     control_name="UseExternalBrowser"
+     draw_border="false"
+     follows="top|left"
+     height="40"
+     layout="topleft"
+     left_delta="50"
+     name="use_external_browser"
+     top_pad="4"
+     width="480">
+        <radio_item
+         height="20"
+         label="Use built-in browser"
+         layout="topleft"
+		 left="0"
+		 name="internal"
+         tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]."
+		 top="0"
+         width="480" />
+		<radio_item
+         height="20"
+         label="Use my browser (IE, Firefox)"
+         layout="topleft"
+         left_delta="0"
+         name="external"
+         tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen."
+         top_delta="20"
+         width="480" />
+    </radio_group>
+    
+   <check_box
+     top_delta="4"
+     enabled="true"
+     follows="left|top"
+     height="16"
+     initial_value="false"
+     label="Web Proxy"
+     left_delta="0"
+     mouse_opaque="true"
+     name="web_proxy_enabled"
+     radio_style="false"
+     width="400" />
+    <line_editor
+     control_name="BrowserProxyAddress"
+     enabled_control="BrowserProxyEnabled"
+	 follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="1"
+     name="web_proxy_editor"
+     tool_tip="The name or IP address of the proxy you would like to use"
+     top_pad="4"
+     width="200" />
+    <button
+     follows="left|top"
+     height="22"
+     enabled="false"
+     label="Browse"
+     label_selected="Browse"
+     layout="topleft"
+     left_pad="5"
+     name="set_proxy"
+     top_pad="-21"
+     width="100">
+        <button.commit_callback
+         function="Pref.SetCache" />
+    </button>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_delta="-203"
+     name="Proxy location"
+     top_delta="20"
+     width="300"
+     text_color="LtGray_50">
+        Proxy location
+    </text></panel>