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_edit_ext_day_cycle.xml5
-rw-r--r--indra/newview/skins/default/xui/en/floater_fixedenvironment.xml11
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_environment.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml2
4 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index e3cd72c39d..dd0048e8f8 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -3,13 +3,14 @@
layout="topleft"
name="env_edit_extdaycycle"
help_topic="day_presets"
- save_rect="true"
+ save_rect="false"
title="Edit Day Cycle"
width="705"
height="650"
min_width="705"
min_height="650"
- can_resize="true">
+ single_instance="true"
+ can_resize="false">
<!-- obsolete?, add as hint for 'save' button? -->
<string name="title_new">Create a New Day Cycle</string>
diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index f88618fb71..36462dcd02 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -2,20 +2,19 @@
<floater
can_minimize="false"
can_tear_off="false"
- can_resize="true"
+ can_resize="false"
can_drag_on_left="false"
can_close="true"
- can_dock="true"
+ can_dock="false"
bevel_style="in"
- height="500"
+ height="550"
layout="topleft"
name="Fixed Environment"
save_rect="true"
title="Fixed Environment"
- save_dock_state="true"
- save_visibility="true"
+ save_visibility="false"
single_instance="true"
- width="650">
+ width="750">
<layout_stack name="floater_stack"
left="5"
top="5"
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 3a1a8c432a..557e093f51 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -29,8 +29,8 @@
valign="top"
top_pad="20"
text_color="white">
-Parcel environmental settings are
-disabled on legacy regions.
+No Parcel parcel is selected. Environmental
+settings are disabled.
</text>
</layout_panel>
<layout_panel
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 586aff4bb8..4b72bbbe0e 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -260,7 +260,7 @@
left_delta="5"
min_val="0.25"
max_val="20"
- name="sun_scale"
+ name="moon_scale"
top_delta="15"
width="130"
can_edit_text="true"/>