diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-16 02:22:54 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-16 02:22:54 +0200 |
| commit | 5ccdcf51a3b4cb46a8c9134636bc3bd5f2129f92 (patch) | |
| tree | fd0dbaf5b47674beaf7abd159bfec5fcd1428766 /indra/newview/llinventoryicon.cpp | |
| parent | 3641541c6cc7f33f0e0dc2e1eb2cfdfcec23322b (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch master (DRTVWR-545) into DRTVWR-542-meshopt
Diffstat (limited to 'indra/newview/llinventoryicon.cpp')
| -rw-r--r-- | indra/newview/llinventoryicon.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp index 81c001b8bd..44e493fdf4 100644 --- a/indra/newview/llinventoryicon.cpp +++ b/indra/newview/llinventoryicon.cpp @@ -196,7 +196,7 @@ const std::string& LLInventoryIcon::getIconName(LLInventoryType::EIconName idx) LLInventoryType::EIconName LLInventoryIcon::assignWearableIcon(U32 misc_flag) { const LLWearableType::EType wearable_type = LLWearableType::inventoryFlagsToWearableType(misc_flag); - return LLWearableType::getIconName(wearable_type); + return LLWearableType::getInstance()->getIconName(wearable_type); } LLInventoryType::EIconName LLInventoryIcon::assignSettingsIcon(U32 misc_flag) |