summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/menu_viewer.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml67
1 files changed, 28 insertions, 39 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 42744b561f..f676df5e8b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -652,8 +652,8 @@
<menu
create_jump_keys="true"
- label="Sun"
- name="Sun"
+ label="Environment"
+ name="Environment"
tear_off="true">
<menu_item_check
label="Sunrise"
@@ -697,10 +697,9 @@
function="World.EnableEnvSettings"
parameter="midnight" />
</menu_item_check>
- <menu_item_separator/>
<menu_item_check
- label="Use Region Settings"
- name="Use Region Settings">
+ label="Use Shared Environment"
+ name="Use Shared Environment">
<menu_item_check.on_click
function="World.EnvSettings"
parameter="region" />
@@ -708,9 +707,29 @@
function="World.EnableEnvSettings"
parameter="region" />
</menu_item_check>
+ <menu_item_separator/>
+ <menu_item_call
+ label="My Environments..."
+ name="my_environs">
+ <menu_item_call.on_click
+ function="World.EnvSettings"
+ parameter="my_environs" />
+ </menu_item_call>
+ <menu_item_separator/>
+ <menu_item_check
+ label="Pause Clouds"
+ name="pause_clouds">
+ <menu_item_check.on_click
+ function="World.EnvSettings"
+ parameter="pause_clouds" />
+ <menu_item_check.on_check
+ function="World.EnableEnvSettings"
+ parameter="pause_clouds" />
+ </menu_item_check>
+
</menu>
-
+<!--
<menu
create_jump_keys="true"
label="Environment Editor"
@@ -726,7 +745,7 @@
</menu_item_call>
<menu_item_separator/>
-
+
<menu
name="Water Presets"
label="Water Presets">
@@ -744,18 +763,8 @@
function="World.EnvPreset"
parameter="edit_water"/>
</menu_item_call>
- <menu_item_call
- label="Delete preset..."
- name="delete_water_preset">
- <menu_item_call.on_click
- function="World.EnvPreset"
- parameter="delete_water"/>
- <menu_item_call.on_enable
- function="World.EnableEnvPreset"
- parameter="delete_water"/>
- </menu_item_call>
</menu>
-
+
<menu
name="Sky Presets"
label="Sky Presets">
@@ -773,16 +782,6 @@
function="World.EnvPreset"
parameter="edit_sky"/>
</menu_item_call>
- <menu_item_call
- label="Delete preset..."
- name="delete_sky_preset">
- <menu_item_call.on_click
- function="World.EnvPreset"
- parameter="delete_sky"/>
- <menu_item_call.on_enable
- function="World.EnableEnvPreset"
- parameter="delete_sky"/>
- </menu_item_call>
</menu>
<menu
@@ -802,19 +801,9 @@
function="World.EnvPreset"
parameter="edit_day_cycle"/>
</menu_item_call>
- <menu_item_call
- label="Delete preset..."
- name="delete_day_preset">
- <menu_item_call.on_click
- function="World.EnvPreset"
- parameter="delete_day_cycle"/>
- <menu_item_call.on_enable
- function="World.EnableEnvPreset"
- parameter="delete_day_cycle"/>
- </menu_item_call>
</menu>
</menu>
-
+-->
</menu>
<menu