From 1559ad47924711f64ecd540bc605d9aa1f7221e6 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 24 Jun 2022 13:09:24 +0300
Subject: [PATCH] SL-17649 Icon for Material type in Inventory
---
indra/llcommon/llassettype.cpp | 2 +-
indra/llinventory/llinventorytype.cpp | 1 +
indra/newview/llinventoryicon.cpp | 5 +++++
.../skins/default/textures/icons/Inv_Material.png | Bin 0 -> 684 bytes
indra/newview/skins/default/textures/textures.xml | 1 +
5 files changed, 8 insertions(+), 1 deletion(-)
create mode 100644 indra/newview/skins/default/textures/icons/Inv_Material.png
diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp
index 0bb1f1a0fdd..f08cc180366 100644
--- a/indra/llcommon/llassettype.cpp
+++ b/indra/llcommon/llassettype.cpp
@@ -96,7 +96,7 @@ LLAssetDictionary::LLAssetDictionary()
addEntry(LLAssetType::AT_WIDGET, new AssetEntry("WIDGET", "widget", "widget", false, false, false));
addEntry(LLAssetType::AT_PERSON, new AssetEntry("PERSON", "person", "person", false, false, false));
addEntry(LLAssetType::AT_SETTINGS, new AssetEntry("SETTINGS", "settings", "settings blob", true, true, true));
- addEntry(LLAssetType::AT_MATERIAL, new AssetEntry("MATERIAL", "material", "render material", true, true, true));
+ addEntry(LLAssetType::AT_MATERIAL, new AssetEntry("MATERIAL", "material", "render material", true, true, true));
addEntry(LLAssetType::AT_UNKNOWN, new AssetEntry("UNKNOWN", "invalid", NULL, false, false, false));
addEntry(LLAssetType::AT_NONE, new AssetEntry("NONE", "-1", NULL, FALSE, FALSE, FALSE));
diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp
index 57d521429c1..ceda2f3caf3 100644
--- a/indra/llinventory/llinventorytype.cpp
+++ b/indra/llinventory/llinventorytype.cpp
@@ -86,6 +86,7 @@ LLInventoryDictionary::LLInventoryDictionary()
addEntry(LLInventoryType::IT_WIDGET, new InventoryEntry("widget", "widget", 1, LLAssetType::AT_WIDGET));
addEntry(LLInventoryType::IT_PERSON, new InventoryEntry("person", "person", 1, LLAssetType::AT_PERSON));
addEntry(LLInventoryType::IT_SETTINGS, new InventoryEntry("settings", "settings", 1, LLAssetType::AT_SETTINGS));
+ addEntry(LLInventoryType::IT_MATERIAL, new InventoryEntry("material", "render material", 1, LLAssetType::AT_MATERIAL));
}
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp
index 44e493fdf45..e9b0e8404a2 100644
--- a/indra/newview/llinventoryicon.cpp
+++ b/indra/newview/llinventoryicon.cpp
@@ -99,6 +99,8 @@ LLIconDictionary::LLIconDictionary()
addEntry(LLInventoryType::ICONNAME_SETTINGS_DAY, new IconEntry("Inv_SettingsDay"));
addEntry(LLInventoryType::ICONNAME_SETTINGS, new IconEntry("Inv_Settings"));
+ addEntry(LLInventoryType::ICONNAME_MATERIAL, new IconEntry("Inv_Material"));
+
addEntry(LLInventoryType::ICONNAME_INVALID, new IconEntry("Inv_Invalid"));
addEntry(LLInventoryType::ICONNAME_UNKNOWN, new IconEntry("Inv_Unknown"));
@@ -177,6 +179,9 @@ const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type,
case LLAssetType::AT_SETTINGS:
idx = assignSettingsIcon(misc_flag);
break;
+ case LLAssetType::AT_MATERIAL:
+ idx = LLInventoryType::ICONNAME_MATERIAL;
+ break;
case LLAssetType::AT_UNKNOWN:
idx = LLInventoryType::ICONNAME_UNKNOWN;
default:
diff --git a/indra/newview/skins/default/textures/icons/Inv_Material.png b/indra/newview/skins/default/textures/icons/Inv_Material.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5918ceaedc671003c17715cee7f5ddf340020cd
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!PDw;TRCwB?Q`>43K@dINGnvfBL`cGJ
z#MOk27l?^VFenIy5dT5H#|K~i3-K#NeDFy~AetB-L<wdS6F1EL(%sY3*36>28t_32
zY6hCFQ>RXyX2ux&PuPDREG;jad(#dcHeECw3#l$~kQR7zCb1tE__(*rM(?vx2AgYL
z^Q7CvMtcU}V}MkM(im};;v`de-4}RqEb(^dJv+x>{Z7|BU%!fl&LS`~4~#WnLLX)C
z0I4`cSq4~}WZ-igYuy#I^=`m~SD%|px6ISkCKj$OBAe>e#Z~0?1e_LuH7-KJLR=WM
zEQ1GAhDKd6zZl$|b+Iu|w5Qu>*bZ>HQv)=Pz96H2VY^V&OOhUm(r8;6bIyQ#&0zD=
z1mKJlT;rU|xe&;yC@;!7(?Ua+1mc*X28$Oe!3rP>kXe&;=PI&P!aM6DP9mgI*4<-D
zRT@n45dc<gLS!(fJ-D-1p!uNl_kJJ!lODn_K%D1@Xe${p;G8a)ku7|V6gH)xOW&Zv
z7{YQ86C*E*;RPOoBt#%2d^%GlX=5>jnhgP7ou+u)ZXhWX(l|k;K>!*)b@j6<1-x7$
zClMLr(3D4t4Mp7cC0?GSFuEWXS#6#ujS!H5JOb!baY8GkYK&V{tSy`>3<37{_Smye
z5qA6xS}PJtBBXh}oKh4JBpN5$uFc^y8(Rs-{_em?zghYI>TUC=#c{(eYq30`5z)}q
z+zJd|m5uF;<EIPH0Sq3~is_IYuDj$b+t6b&I2H_tG;>A!!|q=m)4#+I0R{kuA5Tm5
S7=8Bu0000<MNUMnLSTZ29V7k#
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index a36b859b6c0..b0ae5fe447e 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -303,6 +303,7 @@ with the same filename but different name
<texture name="Inv_LostClosed" file_name="icons/Inv_LostClosed.png" preload="false" />
<texture name="Inv_LostOpen" file_name="icons/Inv_LostOpen.png" preload="false" />
<texture name="Inv_Landmark" file_name="icons/Inv_Landmark.png" preload="false" />
+ <texture name="Inv_Material" file_name="icons/Inv_Material.png" preload="false" />
<texture name="Inv_Mesh" file_name="icons/Inv_Mesh.png" preload="false" />
<texture name="Inv_Notecard" file_name="icons/Inv_Notecard.png" preload="false" />
<texture name="Inv_Object" file_name="icons/Inv_Object.png" preload="false" />
--
GitLab