diff options
author | Kelly Washington <kelly@lindenlab.com> | 2011-03-31 14:07:54 -0700 |
---|---|---|
committer | Kelly Washington <kelly@lindenlab.com> | 2011-03-31 14:07:54 -0700 |
commit | 0080ed8e2914fba475b224344d8e4233e8fa48e2 (patch) | |
tree | c316dd991d5b54a19594639686215230a89736b4 /indra/newview/skins/default/xui/en/floater_preferences.xml | |
parent | 0b44850c6f1057cd095ed9fe68f9285e546c662e (diff) | |
parent | 5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff) |
Merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_preferences.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_preferences.xml | 28 |
1 files changed, 21 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..8eee8f44b5 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 & Media" layout="topleft" @@ -86,6 +79,13 @@ name="chat" /> <panel class="panel_preference" + filename="panel_preferences_move.xml" + label="Move & View" + layout="topleft" + help_topic="preferences_move_tab" + name="move" /> + <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" |