diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-03-31 18:24:01 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-03-31 18:24:01 +0300 |
| commit | 9a9339d8a478976019b8a3afda6b0f57ab6a3fd2 (patch) | |
| tree | 7b1d46ae1f3aabb330bf8153a04bcb8bc46f9475 /indra/newview | |
| parent | 7aa3f87fdd3eba47867be28ad489b107a523110e (diff) | |
STORM-1126 WIP Windlight Estate Settings integration: pass 2
Added the "Use Region Environment Settings" checkbox and the "Use Local Time" button back to the environment editor.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_env_settings.xml | 18 |
1 files changed, 16 insertions, 2 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 14f9e2db95..d9eca7121d 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="150" + height="165" layout="topleft" name="Environment Editor Floater" help_topic="environment_editor_floater" @@ -133,6 +133,12 @@ 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" @@ -140,7 +146,15 @@ layout="topleft" left="10" name="EnvUseEstateTimeButton" - top="120" + top_pad="6" + width="137" /> + <button + follows="left|top" + height="23" + label="Use Local Time" + left_pad="5" + name="EnvUseLocalTimeButton" + top_delta="0" width="137" /> <button follows="left|top" |