From 171cb519576139ccfda801f5c7b5c62ea4dde23f Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 28 Sep 2018 15:24:13 +0300
Subject: SL-9762 Fixed EEP Several Day Cycle UI bits are movable
---
.../skins/default/xui/en/floater_edit_ext_day_cycle.xml | 14 +++++++-------
.../skins/default/xui/en/floater_fixedenvironment.xml | 2 +-
.../skins/default/xui/en/panel_settings_sky_atmos.xml | 6 +++---
.../skins/default/xui/en/panel_settings_sky_clouds.xml | 4 ++--
.../skins/default/xui/en/panel_settings_sky_density.xml | 6 +++---
.../skins/default/xui/en/panel_settings_sky_sunmoon.xml | 6 +++---
.../newview/skins/default/xui/en/panel_settings_water.xml | 6 +++---
7 files changed, 22 insertions(+), 22 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 0c4d342297..e1c08a24f2 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
@@ -33,7 +33,7 @@
<layout_panel name="name_and_import"
border="false"
auto_resize="false"
- user_resize="true"
+ user_resize="false"
height="29"
min_height="29"
background_visible="false">
@@ -73,7 +73,7 @@
<layout_panel name="content"
border="false"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
background_visible="false">
<layout_stack name="content_stack"
width="705"
@@ -85,7 +85,7 @@
border="false"
bevel_style="in"
auto_resize="false"
- user_resize="true"
+ user_resize="false"
height="150"
min_height="0"
visible="true">
@@ -424,7 +424,7 @@
</layout_panel>
<layout_panel name="frame_edit_controls"
auto_resize="false"
- user_resize="true"
+ user_resize="false"
height="30"
width="700"
min_height="30"
@@ -446,7 +446,7 @@ Select a key frame from the timeline above to edit settings.
</layout_panel>
<layout_panel name="frame_settings_water"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
height="420"
width="700"
min_height="0"
@@ -476,7 +476,7 @@ Select a key frame from the timeline above to edit settings.
</layout_panel>
<layout_panel name="frame_settings_sky"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
height="420"
width="700"
min_height="0"
@@ -538,7 +538,7 @@ Select a key frame from the timeline above to edit settings.
</layout_panel>
<layout_panel name="buttons"
auto_resize="false"
- user_resize="true"
+ user_resize="false"
height="26"
min_height="26"
visible="true"
diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index 7cf7e8bb32..348c0ce195 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -69,7 +69,7 @@
</layout_panel>
<layout_panel name="tab_area"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
height="11"
min_height="0"
visible="true">
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 8ef96009d4..18c2ac0db9 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -85,7 +85,7 @@
border="true"
bevel_style="in"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
visible="true">
<layout_stack name="atmosphere1"
left="5"
@@ -98,7 +98,7 @@
border="false"
bevel_style="in"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
visible="true"
min_width="225">
<text
@@ -174,7 +174,7 @@
border="false"
bevel_style="in"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
visible="true"
min_width="225">
<text
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 568345e01f..886e3c1e04 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -20,7 +20,7 @@
border="true"
bevel_style="in"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
visible="true"
height="75">
<text
@@ -131,7 +131,7 @@
border="true"
bevel_style="in"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
visible="true"
height="75">
<text
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
index e071b30c80..e9aa07957e 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -20,7 +20,7 @@
border="true"
bevel_style="in"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
visible="true"
height="14">
<slider
@@ -99,7 +99,7 @@
border="true"
bevel_style="in"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
visible="true"
height="16">
<slider
@@ -193,7 +193,7 @@
border="true"
bevel_style="in"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
visible="true"
height="14">
<slider
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 bc267bb7b9..fd9933f69f 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
@@ -19,7 +19,7 @@
border="true"
bevel_style="in"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
visible="true"
height="350">
<text
@@ -181,7 +181,7 @@
border="false"
bevel_style="in"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
visible="true"
height="350">
<layout_stack
@@ -195,7 +195,7 @@
border="true"
bevel_style="in"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
visible="true"
height="220">
<text
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index d88195bf48..eead03d185 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -141,7 +141,7 @@
</layout_panel>
<layout_panel
auto_resize="true"
- user_resize="true"
+ user_resize="false"
visible="true">
<layout_stack name="water_stack2"
left="5"
@@ -154,7 +154,7 @@
border="true"
bevel_style="in"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
visible="true"
min_width="460"
width="50">
@@ -276,7 +276,7 @@
border="true"
bevel_style="in"
auto_resize="true"
- user_resize="true"
+ user_resize="false"
width="50"
visible="true">
<text
--
cgit v1.2.3