diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-22 18:25:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-22 18:25:57 -0400 |
| commit | c3df5f5d675abd107e1f0b4e3fb262226978ddb5 (patch) | |
| tree | b89e53c972d8db034d74e1dbc55bf27ab82d3b88 /indra/newview/skins/default/xui/en/menu_viewer.xml | |
| parent | 391bef0df021dd3a56c262087ba977ab9f2bb662 (diff) | |
| parent | 95847fc2061e9b71a4d2ce078b525c047fc4ad36 (diff) | |
merge up latest viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index a5115b0faa..afb78097d8 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -470,7 +470,7 @@ <menu_item_separator/> - <menu + <menu create_jump_keys="true" label="Sun" name="Environment Settings" @@ -523,6 +523,22 @@ parameter="editor" /> </menu_item_call> </menu> + <menu + create_jump_keys="true" + label="Edit My Environment" + name="Environment" + tear_off="true"> + <menu_item_check + label="Use Region Settings" + name="Use Region Settings"> + <on_check + function="World.CheckEnvironment" + parameter="use_region_settings" /> + <on_click + function="World.Environment" + parameter="use_region_settings" /> + </menu_item_check> + </menu> </menu> <menu create_jump_keys="true" |