summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2022-08-17 12:20:15 -0700
committerCallum Prentice <callum@lindenlab.com>2022-08-17 12:20:15 -0700
commit6b71300db74711bbcefb8c6c65e2f162305d068f (patch)
treed512aad9dfab6be4886cad37914ccbdcf5b6bbbd /indra/newview/skins/default/xui
parent0550569299d1030ca368c2fd45750236e2ee7793 (diff)
SL-17699 Add upport for materials to texture picker. Temporarilyly change the filtered inventory panel to a regular one so that materials show too. A fix for this that lets us revert to the asset_filtered version is in progress and will be pulled in soon - then this change too will be reverted
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_texture_ctrl.xml2
1 files changed, 1 insertions, 1 deletions
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 b47ade5d98..7d23034a09 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -169,7 +169,7 @@
name="inventory search editor"
top="48"
width="231" />
- <asset_filtered_inv_panel
+ <inventory_panel
allow_multi_select="false"
bg_visible="true"
bg_alpha_color="DkGray2"