diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-05-28 17:47:37 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-05-28 17:47:37 -0400 |
| commit | d822d0e96bb69374f49fef8a827a042474deda8d (patch) | |
| tree | 91834ede57a52fb6e1d85dace0e1ea49bb62c394 /indra/llappearance/llwearabletype.cpp | |
| parent | 25c7e0114085a296eb3e2f7fba7cd2cb5b6177f8 (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
merge
Diffstat (limited to 'indra/llappearance/llwearabletype.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llappearance/llwearabletype.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llappearance/llwearabletype.cpp b/indra/llappearance/llwearabletype.cpp index 618e2a1941..87109a5906 100644..100755 --- a/indra/llappearance/llwearabletype.cpp +++ b/indra/llappearance/llwearabletype.cpp @@ -27,6 +27,7 @@ #include "linden_common.h" #include "llwearabletype.h" #include "llinventorytype.h" +#include "llinventorydefines.h" static LLTranslationBridge* sTrans = NULL; @@ -160,7 +161,7 @@ BOOL LLWearableType::getDisableCameraSwitch(LLWearableType::EType type) return entry->mDisableCameraSwitch; } -// static +// static BOOL LLWearableType::getAllowMultiwear(LLWearableType::EType type) { const LLWearableDictionary *dict = LLWearableDictionary::getInstance(); @@ -169,3 +170,9 @@ BOOL LLWearableType::getAllowMultiwear(LLWearableType::EType type) return entry->mAllowMultiwear; } +// static +LLWearableType::EType LLWearableType::inventoryFlagsToWearableType(U32 flags) +{ + return (LLWearableType::EType)(flags & LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK); +} + |