diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-06-08 10:57:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-06-08 10:57:49 -0700 |
| commit | ce2fc7d775d313a7dfe528b9c09a1d03ad077b50 (patch) | |
| tree | 40ffdfa0e44a8ad12c35940f4f62ab5cc5fdaeca /indra/newview/llviewerinventory.cpp | |
| parent | dde75d76210c9e4df0516b89f8f199fe081a5e87 (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
Merge
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()); } |