From f842aeac30c1b3abad76201d5c5f9318fd0c960e Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 17 Aug 2022 10:29:33 -0700
Subject: SL-17699 Add upport for materials to texture picker.  A work in
 progress but I am about to make some larger changes to inventory code so I
 wanted to secure this first

---
 .../skins/default/xui/en/floater_texture_ctrl.xml  | 30 +++++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

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

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 3a66911389..7d23034a09 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -137,7 +137,29 @@
      value="Preview Disabled"
      word_wrap="true"
      visible="false"
-     width="87" />
+     width="87" />  
+    <combo_box
+      follows="left|top|right"
+      height="23"
+      label="Choose Textures, Materials or LIFE!"
+      layout="topleft"
+      left="175"
+      name="textures_material_combo"
+      top="20"
+      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>
     <filter_editor
      follows="left|top|right"
      height="23"
@@ -145,15 +167,15 @@
      layout="topleft"
      left="175"
      name="inventory search editor"
-     top="20"
+     top="48"
      width="231" />
-    <asset_filtered_inv_panel
+    <inventory_panel
      allow_multi_select="false"
      bg_visible="true"
      bg_alpha_color="DkGray2"
      border="false"
      follows="all"
-     height="233"
+     height="195"
      layout="topleft"
      left_delta="0"
      name="inventory panel"
-- 
cgit v1.2.3