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

---
 indra/newview/llsettingspicker.cpp                 |  4 ---
 .../default/xui/en/floater_settings_picker.xml     | 33 ++++++++++------------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/indra/newview/llsettingspicker.cpp b/indra/newview/llsettingspicker.cpp
index 6b1254ae9e..b82be3a23e 100644
--- a/indra/newview/llsettingspicker.cpp
+++ b/indra/newview/llsettingspicker.cpp
@@ -48,7 +48,6 @@ namespace
 
     const std::string FLT_INVENTORY_SEARCH("flt_inventory_search");
     const std::string PNL_INVENTORY("pnl_inventory");
-    const std::string CHK_SHOWFOLDERS("chk_showfolders");
     const std::string BTN_SELECT("btn_select");
     const std::string BTN_CANCEL("btn_cancel");
 
@@ -92,9 +91,6 @@ BOOL LLFloaterSettingsPicker::postBuild()
         setTitle(pick + mLabel);
     }
 
-//    childSetCommitCallback(CHK_SHOWFOLDERS, onShowFolders, this);
-    getChildView(CHK_SHOWFOLDERS)->setVisible(FALSE);
-
     mFilterEdit = getChild<LLFilterEditor>(FLT_INVENTORY_SEARCH);
     mFilterEdit->setCommitCallback([this](LLUICtrl*, const LLSD& param){ onFilterEdit(param.asString()); });
     
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