diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-06-05 16:30:04 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-06-05 16:30:04 +0300 |
| commit | b59770199afae70f8fa14b3f050d5f5d4818cb07 (patch) | |
| tree | 112f4fe9a08eb1700062201482246fe429dfc35c /indra/newview/llinventoryicon.cpp | |
| parent | 77b4f1d51c6e9d2b7d6711bfa38912ba4682c320 (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
Merge from viewer-release
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); } |