summaryrefslogtreecommitdiff
path: root/indra/llappearance
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-03-09 18:52:59 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-03-09 18:52:59 -0400
commit738195a98d3009becd5dbeaae7f77e70fff7de3e (patch)
tree315a6c514a8e9670c7f6457833aeab7e87aa5207 /indra/llappearance
parentd2b3d187d96cc85dee1709a121d4570f6488debb (diff)
SL-103 WIP - fix for some inventory items not enabling add
Diffstat (limited to 'indra/llappearance')
-rwxr-xr-xindra/llappearance/llwearabletype.cpp7
-rwxr-xr-x[-rw-r--r--]indra/llappearance/llwearabletype.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/llappearance/llwearabletype.cpp b/indra/llappearance/llwearabletype.cpp
index 58c446e586..87109a5906 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;
@@ -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);
+}
+
diff --git a/indra/llappearance/llwearabletype.h b/indra/llappearance/llwearabletype.h
index e51e6731d3..6fa87ec30e 100644..100755
--- a/indra/llappearance/llwearabletype.h
+++ b/indra/llappearance/llwearabletype.h
@@ -77,6 +77,7 @@ public:
static LLInventoryType::EIconName getIconName(EType type);
static BOOL getDisableCameraSwitch(EType type);
static BOOL getAllowMultiwear(EType type);
+ static EType inventoryFlagsToWearableType(U32 flags);
protected:
LLWearableType() {}