diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-11-16 10:23:04 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-11-16 10:23:04 -0700 |
commit | 17f71efce08ed4e677b497f4734d6f9f1fef56a3 (patch) | |
tree | 8e27a7cb161f6e24439a772c5bcfdd4a3ee6f83a /indra/newview/llinventoryicon.cpp | |
parent | e914f3e4a11ff86b3e05089c9b3a6677ec623c9c (diff) | |
parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) |
Merge branch 'master' v6.5.1 into DRTVWR-528
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) |