From c822d8af16428cf245ae57305a4f39d3fccd672b Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 20 Jul 2018 19:10:22 +0300
Subject: MAINT-8344 implement slider support for an overlap threshold and
 reenable shift-copy

---
 indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

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 aac2084543..caf7153a5c 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
@@ -219,7 +219,8 @@
                                 draw_track="false"
                                 follows="bottom"
                                 height="10"
-                                increment="0.01"
+                                increment="0.005"
+                                overlap_threshold="0.026"
                                 initial_value="0"
                                 layout="topleft"
                                 left="10"
@@ -235,7 +236,8 @@
                                 decimal_digits="0"
                                 follows="bottom"
                                 height="10"
-                                increment="0.01"
+                                increment="0.005"
+                                overlap_threshold="0.026"
                                 initial_value="0"
                                 layout="topleft"
                                 left="10"
-- 
cgit v1.2.3


From c24cbff2ab2a5f4b78ce10deb5122453f5849b68 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 30 Jul 2018 18:04:35 +0300
Subject: MAINT-8830 EEP rename "Default Environment" option in About Land >
 Environment

---
 indra/newview/skins/default/xui/en/panel_region_environment.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

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 21518338ff..e469143e41 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -48,9 +48,9 @@
                             max_width="200"
                             width="200">
                         <radio_item
-                                label="Default Environment"
+                                label="Use Region Settings"
                                 layout="topleft"
-                                name="use_default_setting"
+                                name="use_region_setting"
                                 height="20"/>
                         <radio_item
                                 label="Custom Environment"
-- 
cgit v1.2.3


From dfe3757236f28c80142d13b65a191f797f4488a7 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 30 Jul 2018 18:38:59 +0300
Subject: MAINT-8879 EEP Make image swatches square

---
 indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml  | 2 +-
 indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml | 4 ++--
 indra/newview/skins/default/xui/en/panel_settings_water.xml       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins')

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 b4c3089942..412ed8bf82 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
@@ -120,7 +120,7 @@
                 Cloud Image:
             </text>
             <texture_picker
-                    height="100"
+                    height="123"
                     layout="topleft"
                     left_delta="5"
                     name="cloud_map"
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 a951e39697..15d20e46b7 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
@@ -169,7 +169,7 @@
                         Image:
                     </text>
                     <texture_picker
-                            height="100"
+                            height="123"
                             layout="topleft"
                             left_delta="5"
                             name="sun_image"
@@ -220,7 +220,7 @@
                         Image:
                     </text>
                     <texture_picker
-                            height="100"
+                            height="123"
                             layout="topleft"
                             left_delta="5"
                             name="moon_image"
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 c24a2dbbb6..0b03ec5cc0 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -167,12 +167,12 @@
                         Normal Map
                     </text>
                     <texture_picker
-                            height="75"
+                            height="84"
                             layout="topleft"
                             left_delta="0"
                             name="water_normal_map"
                             top_pad="5"
-                            width="75"/>
+                            width="61"/>
 
                     <text
                             follows="left|top"
-- 
cgit v1.2.3


From d7ae8a0d28483a8ed5d93152177aa655266f7004 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 30 Jul 2018 20:08:58 +0300
Subject: MAINT-8344 EEP Make arrows white

---
 indra/newview/skins/default/xui/en/panel_settings_water.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

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 0b03ec5cc0..4c9ae57941 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -196,7 +196,7 @@
                         min_val_y="-4"
                         max_val_y="4"
                         increment_y="0.5f"
-                        arrow_color="red"/>
+                        arrow_color="white"/>
                     
                     <text
                             follows="left|top"
@@ -218,7 +218,7 @@
                         max_val_x="4"
                         min_val_y="-4"
                         max_val_y="4" 
-                        arrow_color="green"/>
+                        arrow_color="white"/>
 
                     <text
                             follows="left|top|right"
-- 
cgit v1.2.3