From d83f08cab790721a0905fef51144514eadc757f9 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 5 Oct 2018 11:50:23 +0300
Subject: SL-9819 [EEP] Allign Show Empty Folders checkbox to the Environment
 list.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index dd05dd5a20..a11a2c1200 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -125,8 +125,8 @@
                     label="Show Empty Folders"
                     layout="topleft"
                     name="chk_showfolders"
-                    top="0"
-                    left_delta="-3"
+                    top="2"
+                    left_delta="-1"
                     width="200" />
         </layout_panel>
         <layout_panel
@@ -139,7 +139,7 @@
             <panel
                     background_visible="true"
                     bevel_style="none"
-                    top_pad="0"
+                    top_pad="1"
                     follows="top|left|right"
                     height="30"
                     label="bottom_panel"
-- 
cgit v1.2.3


From 28506a3405ddde2234b8d1d287031043f8ea92ad Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 5 Oct 2018 14:10:27 +0300
Subject: =?UTF-8?q?SL-9821=20FIXED=20[EEP]=20The=20bottom=20scrollbar=20do?=
 =?UTF-8?q?es=20not=20work=20in=20the=20=E2=80=98Pick:=20Select=20Settings?=
 =?UTF-8?q?=E2=80=99=20floater?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/xui/en/floater_settings_picker.xml     | 33 ++++++++++------------
 1 file changed, 15 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 2258a1dc24..2862d1ae37 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -29,8 +29,6 @@
             left="6"
             right="-6"
             bottom="-10"
-            auto_resize="true"
-            user_resize="true"
             orientation="vertical">
         <layout_panel name="temp"
                 border="false"
@@ -49,30 +47,29 @@
                     name="flt_inventory_search"
                     top="4"
                     right="-2" />
-            <inventory_panel
+            <panel
+              name="pnl_inv_wrap"
+              follows="all"
+              layout="topleft"
+              left="2"
+              top="2"
+              right="-2"
+              bottom="-2"
+              background_visible="true"
+              bg_alpha_color="DkGray2">
+                <inventory_panel
                     allow_multi_select="false"
                     suppress_folder_menu="true"
                     bg_visible="true"
                     bg_alpha_color="DkGray2"
                     border="false"
-                    follows="left|top|right|bottom"
+                    follows="all"
                     left_delta="0"
                     name="pnl_inventory"
-                    top="31"
+                    top="1"
                     right="-4"
-                    bottom="-26"
-                     /> 
-            <check_box
-                    follows="left|bottom"
-                    height="14"
-                    initial_value="false"
-                    label="Show folders"
-                    layout="topleft"
-                    name="chk_showfolders"
-                    top="-20"
-                    top_pad="0"
-                    left_delta="-3"
-                    width="200" />
+                    bottom="-1" />
+            </panel>
         </layout_panel>
         <layout_panel name="temp"
                 border="false"
-- 
cgit v1.2.3