diff options
| author | callum_linden <none@none> | 2015-05-26 14:03:07 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-05-26 14:03:07 -0700 |
| commit | 80c67487c062b3105395d8dbf3dfc0be15cc678f (patch) | |
| tree | 67e8aec40d3cd58030d28e1929bf09dcb75b96bc /indra/newview/llviewerinventory.cpp | |
| parent | 80aa29eaec78d267b4fa1822cfbd3a33b268066a (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
Merge with viewer-release after layer-limits release
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rwxr-xr-x | indra/newview/llviewerinventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index d6c8ba10f6..d112118082 100755 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -2106,7 +2106,7 @@ LLWearableType::EType LLViewerInventoryItem::getWearableType() const { return LLWearableType::WT_INVALID; } - return LLWearableType::EType(getFlags() & LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK); + return LLWearableType::inventoryFlagsToWearableType(getFlags()); } |