diff options
| author | simon <none@none> | 2015-06-08 14:54:22 -0700 |
|---|---|---|
| committer | simon <none@none> | 2015-06-08 14:54:22 -0700 |
| commit | 316bdc0ab04f8cfb587bbfbe0966963f7614cce2 (patch) | |
| tree | 0f8e8ef231c7df1d2825adf9929c6b6f9a84f880 /indra/newview/llinventoryicon.cpp | |
| parent | 4647dc6fe7aacccf089d214bf26b47f417bd7ae6 (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
Merge viewer-release and become version 3.7.30
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); } |