diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-05-27 11:08:45 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-05-27 11:08:45 -0400 |
| commit | 9e3eb8991d54a39dc3d4c99739fa1a411ed64b35 (patch) | |
| tree | c96c00d9847ac5ea8edc33835dd634a0829c0e23 /indra/newview/llinventoryicon.cpp | |
| parent | e2544fabe5f63201ca11102aa9b4266cb62211bd (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
merge
Diffstat (limited to 'indra/newview/llinventoryicon.cpp')
| -rwxr-xr-x | 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 b7c4ec6f8b..013a5a7629 100755 --- a/indra/newview/llinventoryicon.cpp +++ b/indra/newview/llinventoryicon.cpp @@ -183,6 +183,6 @@ const std::string& LLInventoryIcon::getIconName(LLInventoryType::EIconName idx) LLInventoryType::EIconName LLInventoryIcon::assignWearableIcon(U32 misc_flag) { - const LLWearableType::EType wearable_type = LLWearableType::EType(LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK & misc_flag); + const LLWearableType::EType wearable_type = LLWearableType::inventoryFlagsToWearableType(misc_flag); return LLWearableType::getIconName(wearable_type); } |