diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-06-27 10:24:53 -0700 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-06-27 10:24:53 -0700 |
| commit | acdd77d4ce31a5014eff72f18b374e877001adf9 (patch) | |
| tree | 2345c2ac7b2e1c8c1b341ccf6ff1e65993d8dea3 /indra/newview/llinventoryicon.cpp | |
| parent | fbb6eb216f5dc06ff5c7c1cabc6ab46a94918e1b (diff) | |
| parent | 231c618a844cee26a3779b703c88d8807df872e6 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-559' into brad/SL-17602-new-material-upload
Diffstat (limited to 'indra/newview/llinventoryicon.cpp')
| -rw-r--r-- | indra/newview/llinventoryicon.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp index 44e493fdf4..e9b0e8404a 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: |