From 87b55e7293d7b87650e9e792f6be6b7e894773de Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 13 Sep 2022 01:15:31 +0300
Subject: SL-17653 Removed unneeded combo box

---
 .../skins/default/xui/en/floater_texture_ctrl.xml  | 93 +++++-----------------
 1 file changed, 22 insertions(+), 71 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index b6a2aaf31b..0cb69137e3 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -139,77 +139,28 @@
      visible="false"
      width="87" />
 
-  <layout_stack name="inventory_stack"
-                width="231"
-                height="276"
-                top="20"
-                left="175"
-                follows="all"
-                animate="false"
-                orientation="vertical">
-    <layout_panel name="combo_layout"
-                  border="false"
-                  bevel_style="in"
-                  auto_resize="false"
-                  user_resize="false"
-                  visible="false"
-                  width="231"
-                  height="24">
-        <combo_box
-          follows="left|top|right"
-          height="23"
-          label="Choose Textures, Materials or LIFE!"
-          layout="topleft"
-          left="0"
-          name="textures_material_combo"
-          top="0"
-          width="231">
-          <combo_box.item
-           label="Materials &amp; Textures"
-           name="Materials_Textures"
-           value="0" />
-          <combo_box.item
-           label="Textures"
-           name="Textures"
-           value="1" />
-          <combo_box.item
-           label="Materials"
-           name="Materials"
-           value="2" />
-        </combo_box>
-    </layout_panel>
-    <layout_panel name="inventory_layout"
-                  border="false"
-                  bevel_style="in"
-                  auto_resize="true"
-                  user_resize="false"
-                  visible="true"
-                  width="231"
-                  height="252">
-      <filter_editor
-       follows="left|top|right"
-       height="23"
-       label="Filter Textures"
-       layout="topleft"
-       left="0"
-       name="inventory search editor"
-       top="4"
-       width="231" />
-      <asset_filtered_inv_panel
-       allow_multi_select="false"
-       bg_visible="true"
-       bg_alpha_color="DkGray2"
-       border="false"
-       follows="all"
-       height="221"
-       layout="topleft"
-       left_delta="0"
-       name="inventory panel"
-       top_pad="4"
-       width="231"
-       filter_asset_types="texture|material"/>
-    </layout_panel>
-  </layout_stack>
+    <filter_editor
+     follows="left|top|right"
+     height="23"
+     label="Filter Textures"
+     layout="topleft"
+     left="175"
+     name="inventory search editor"
+     top="20"
+     width="231" />
+    <asset_filtered_inv_panel
+     allow_multi_select="false"
+     bg_visible="true"
+     bg_alpha_color="DkGray2"
+     border="false"
+     follows="all"
+     height="242"
+     layout="topleft"
+     left_delta="0"
+     name="inventory panel"
+     top_pad="4"
+     width="231"
+     filter_asset_types="texture|material"/>
 
 <!--  middle: local mode -->
     <button
-- 
cgit v1.2.3