diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-05-31 17:10:48 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-05-31 17:10:48 +0100 |
| commit | eb8eaa58a4e28b4db2736000f22fbd97371ef9db (patch) | |
| tree | f27b7dccc4409bce20d9173a6f17d971c689637e /indra/newview/skins/default/xui/en/floater_preferences.xml | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
| parent | f0ae109b696671c5773a5084a7329d0b164b7735 (diff) | |
Merge storm-2145 dev into lindenlab branch parented from viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_preferences.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_preferences.xml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index 845c1efe4d..545816c78a 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -85,13 +85,20 @@ https://accounts.secondlife.com/change_email/ help_topic="preferences_chat_tab" name="chat" /> <panel - class="panel_preference" + class="panel_preference_view" filename="panel_preferences_move.xml" - label="Move & View" + label="Move" layout="topleft" help_topic="preferences_move_tab" name="move" /> <panel + class="panel_preference_view" + filename="panel_preferences_view.xml" + label="View" + layout="topleft" + help_topic="preferences_view_tab" + name="view" /> + <panel class="panel_preference" filename="panel_preferences_alerts.xml" label="Notifications" |