From 1f1d29e3462fb0adff9342b657160441d5b992d0 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 28 Nov 2018 15:05:30 +0200
Subject: SL-9787 EEP Remove Apply to Region from right-click menus.

---
 indra/newview/skins/default/xui/en/menu_inventory.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 6f04785e8c..9b24e2ffcf 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -880,13 +880,6 @@
                 function="Inventory.DoToSelected"
                 parameter="apply_settings_parcel" />
     </menu_item_call>
-    <menu_item_call
-            name="Settings Apply Region"
-            layout="topleft"
-            label="Apply To Region">
-        <menu_item_call.on_click 
-                function="Inventory.DoToSelected"
-                parameter="apply_settings_region" />
     </menu_item_call>
 	<menu_item_separator
 	 layout="topleft"
-- 
cgit v1.2.3


From 58ffb2e4b11d7aaf1fb66531f4925bd359f551cb Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 29 Nov 2018 17:55:23 +0200
Subject: SL-10141 FIXED [EEP] Neighboring sky levels may be closer than 100
 meters to each other in edit mode

---
 indra/newview/skins/default/xui/en/panel_region_environment.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui')

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 18364bbf0b..2f91252d9b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -252,6 +252,7 @@
                     width="17"
                     orientation="vertical"
                     increment="10"
+                    overlap_threshold="100"
                     min_val="100"
                     max_val="4000"
                     layout="topleft"
-- 
cgit v1.2.3


From d66012f85e885679738cf8c488fd8ff460319c85 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 30 Nov 2018 17:48:08 +0200
Subject: SL-9716 [EEP] "Use Shared Environment" does not enable when applying
 an environment to a parcel or region

---
 indra/newview/skins/default/xui/en/menu_inventory.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 9b24e2ffcf..33ecb4477a 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -879,7 +879,6 @@
         <menu_item_call.on_click 
                 function="Inventory.DoToSelected"
                 parameter="apply_settings_parcel" />
-    </menu_item_call>
     </menu_item_call>
 	<menu_item_separator
 	 layout="topleft"
-- 
cgit v1.2.3