summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/floater_preferences.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_preferences.xml')
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences.xml131
1 files changed, 78 insertions, 53 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 1760d5b818..55ae3ee2b0 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -48,31 +48,6 @@
<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"
@@ -91,64 +66,114 @@
layout="topleft"
name="general" />
<panel
+ filename="panel_preferences_graphics1.xml"
+ label="Graphics"
+ layout="topleft"
+ name="display" />
+ <panel
class="panel_preference"
- filename="panel_preferences_input.xml"
- label="Input &amp; Camera"
+ filename="panel_preferences_im.xml"
+ label="Privacy"
layout="topleft"
- name="input" />
+ name="im" />
<panel
class="panel_preference"
- filename="panel_preferences_network.xml"
- label="Network"
+ filename="panel_preferences_audio.xml"
+ label="Sound"
layout="topleft"
- name="network" />
+ name="audio" />
<panel
class="panel_preference"
- filename="panel_preferences_web.xml"
- label="Web"
+ filename="panel_preferences_chat.xml"
+ label="Chat"
layout="topleft"
- name="web" />
+ name="chat" />
<panel
class="panel_preference"
- filename="panel_preferences_graphics1.xml"
- label="Graphics"
+ filename="panel_preferences_popups.xml"
+ label="Alerts"
layout="topleft"
- name="display" />
+ name="msgs" />
<panel
class="panel_preference"
- filename="panel_preferences_audio.xml"
- label="Audio &amp; Video"
+ filename="panel_preferences_input.xml"
+ label="Setup"
layout="topleft"
- name="audio" />
+ name="input" />
<panel
class="panel_preference"
- filename="panel_preferences_chat.xml"
- label="Text Chat"
+ filename="panel_preferences_advanced.xml"
+ label="Advanced"
layout="topleft"
- name="chat" />
+ name="input" />
<panel
class="panel_preference"
- filename="panel_preferences_voice.xml"
- label="Voice Chat"
+ filename="panel_preferences_advanced2.xml"
+ label="Move, not to Advanced"
layout="topleft"
- name="voice" />
+ name="input" />
<panel
class="panel_preference"
- filename="panel_preferences_im.xml"
- label="Communication"
+ filename="panel_preferences_advanced3.xml"
+ label="Not in specs"
layout="topleft"
- name="im" />
+ name="input" />
<panel
class="panel_preference"
- filename="panel_preferences_popups.xml"
- label="Popups"
+ filename="panel_preferences_advanced4.xml"
+ label="Storage/Kill"
layout="topleft"
- name="msgs" />
+ 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
+ class="panel_preference"
+ filename="panel_preferences_voice.xml"
+ label="Voice Chat"
+ layout="topleft"
+ name="voice" />
<panel
class="panel_preference"
filename="panel_preferences_skins.xml"
label="Skins"
layout="topleft"
- name="skins" />
+ name="skins" /-->
</tab_container>
+
+ <!--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-->
+ <!--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" /-->
+
+
</floater>