summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrew Productengine <adyukov@productengine.com>2010-11-10 13:37:31 +0200
committerAndrew Productengine <adyukov@productengine.com>2010-11-10 13:37:31 +0200
commitd99ce25401f03f39e8bfa1bd0e29c431049c03ce (patch)
tree3dfa8cbc5c061cf881decd89f20b4220389d76cb /indra
parent3b31df090ba35e02d7cd85c435236afe143b02a9 (diff)
STORM-566 FIXED Added new tabs to preferences floater.
Their panels are currently empty and will be filled in later tasks.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences.xml28
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_colors.xml12
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_move.xml12
3 files changed, 45 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 50d0011338..36108442f3 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -65,13 +65,6 @@
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"
@@ -86,6 +79,13 @@
name="chat" />
<panel
class="panel_preference"
+ filename="panel_preferences_move.xml"
+ label="Move &amp; View"
+ layout="topleft"
+ help_topic="preferences_move_tab"
+ name="audio" />
+ <panel
+ class="panel_preference"
filename="panel_preferences_alerts.xml"
label="Notifications"
layout="topleft"
@@ -93,6 +93,20 @@
name="msgs" />
<panel
class="panel_preference"
+ filename="panel_preferences_colors.xml"
+ label="Colors"
+ layout="topleft"
+ help_topic="preferences_im_tab"
+ name="colors" />
+ <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_setup.xml"
label="Setup"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
new file mode 100644
index 0000000000..0061c1f229
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="left|top|right|bottom"
+ height="408"
+ label="Colors"
+ layout="topleft"
+ left="102"
+ name="colors_panel"
+ top="1"
+ width="517">
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
new file mode 100644
index 0000000000..2d6dddfc8c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="left|top|right|bottom"
+ height="408"
+ label="Move"
+ layout="topleft"
+ left="102"
+ name="move_panel"
+ top="1"
+ width="517">
+</panel>