From 339e1d200f7fd5f8be715722369295220da2079b Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 17 Aug 2022 13:49:10 -0700
Subject: SL-17699 Add upport for materials to texture picker: restore the
 asset filtered inventory panel and pull in @Caladbolg's fix to make it work
 with more than 1 asset type from here
 https://bitbucket.org/lindenlab/viewer/commits/0ab6dfa12eb04238d82c7a4aea7390cbd28beacd

---
 indra/newview/skins/default/xui/en/floater_my_environments.xml | 2 +-
 indra/newview/skins/default/xui/en/floater_settings_picker.xml | 2 +-
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

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

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 6aff387dcb..db81c8bba2 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -119,7 +119,7 @@
                        follows="all"
                        layout="topleft"
                        name="pnl_settings"
-                       filter_asset_type="settings"/>
+                       filter_asset_types="settings"/>
             </panel>
         </layout_panel>
         <layout_panel
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 3a26c3b547..8931269fe7 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -89,7 +89,7 @@
                     top="1"
                     right="-4"
                     bottom="-1"
-                    filter_asset_type="settings" />
+                    filter_asset_types="settings" />
             </panel>
         </layout_panel>
         <layout_panel name="pnl_combo"
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 7d23034a09..5ab31b404e 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -169,8 +169,8 @@
      name="inventory search editor"
      top="48"
      width="231" />
-    <inventory_panel
-     allow_multi_select="false"
+  <asset_filtered_inv_panel
+   allow_multi_select="false"
      bg_visible="true"
      bg_alpha_color="DkGray2"
      border="false"
@@ -181,7 +181,7 @@
      name="inventory panel"
      top_pad="4"
      width="231"
-     filter_asset_type="texture"/>
+     filter_asset_types="texture|material"/>
      <check_box
      height="14"
      initial_value="false"
-- 
cgit v1.2.3