diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-19 23:24:28 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-19 23:24:28 +0300 |
| commit | db6862e15b1ff6257593eab798250316a350cf73 (patch) | |
| tree | a3683abe55ec9b59e7be600a4ee58428fc837758 /indra/newview/skins | |
| parent | 302e0bc87ec6429de1c4e29ed8469c2b1de766d5 (diff) | |
STORM-1174 FIX Moved "Use Region Environment Settings" to the "World -> Edit My Environment" menu.
It has been a checkbox in the environment editor.
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_env_settings.xml | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 18 |
2 files changed, 19 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml index dbd75495b1..e6cf433c8d 100644 --- a/indra/newview/skins/default/xui/en/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - height="165" + height="150" layout="topleft" name="Environment Editor Floater" help_topic="environment_editor_floater" @@ -134,12 +134,6 @@ name="EnvWaterFogSlider" top_delta="4" width="210" /> - <check_box - follows="left|top" - label="Use Region Environment Settings" - left="8" - name="RegionWLOptIn" - top_pad="20" /> <button follows="left|top" height="23" @@ -147,7 +141,7 @@ layout="topleft" left="10" name="EnvUseEstateTimeButton" - top_pad="6" + top_pad="20" width="137" /> <button follows="left|top" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 51610c0ae0..150e067ab2 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" |