diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-20 20:46:46 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-20 20:46:46 -0400 |
commit | eb15f9a8cee3b09371690da9921351c2612b9781 (patch) | |
tree | 6f7984eefaa88c6c4db2eb802cd5138501e747e2 /indra/newview/skins/default/xui/en/menu_viewer.xml | |
parent | 120f31502eb521c1e0abaeb24972f070e7f75bd6 (diff) | |
parent | db6862e15b1ff6257593eab798250316a350cf73 (diff) |
merge latest changes from windlight integration repo
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" |