summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/floater_env_settings.xml18
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"