Henri Beauchamp: Port of SG-2.0 alpha and tattoo layers (v6)

slviewer-0-v12350-AlphaAndTattooSupport-patch.zip contains the necessary
avatar_lad.xml and other artwork. The new avatar_lad.xml crashes clients
without alpha and tattoo support at startup.

3 files changed, 26 insertions, 20 deletions

diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index 755a57c..1508b46 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -128,6 +128,8 @@ LLInventoryType::NType calc_ntype(
                                                         case WT_UNDERSHIRT:  return LLInventoryType::NIT_UNDERSHIRT;
                                                         case WT_UNDERPANTS:  return LLInventoryType::NIT_UNDERPANTS;
                                                         case WT_SKIRT:       return LLInventoryType::NIT_SKIRT;
+                                                        case WT_ALPHA:       return LLInventoryType::NIT_ALPHA;
+                                                        case WT_TATTOO:       return LLInventoryType::NIT_TATTOO;
                                                         default:             return LLInventoryType::NIT_CLOTHING;
                                                 }
                                         }
diff --git a/linden/indra/llinventory/llinventorytype.h b/linden/indra/llinventory/llinventorytype.h
index 961fa79..ee429c2 100644
--- a/linden/indra/llinventory/llinventorytype.h
+++ b/linden/indra/llinventory/llinventorytype.h
@@ -115,49 +115,51 @@ public:
                 NIT_UNDERSHIRT       =  1 << 10,
                 NIT_UNDERPANTS       =  1 << 11,
                 NIT_SKIRT            =  1 << 12,
-                NIT_CLOTHING         =  0x0001ff0,
+                NIT_ALPHA            =  1 << 13,
+                NIT_TATTOO           =  1 << 14,
+                NIT_CLOTHING         =  0x0007ff0,
 
                 /* Body Parts | Clothing */
-                NIT_WEARABLE         =  0x0001fff,
+                NIT_WEARABLE         =  0x0007fff,
 
                 /* Images */
-                NIT_TEXTURE          =  1 << 13,
-                NIT_SNAPSHOT         =  1 << 14,
-                NIT_IMAGE            =  0x0006000,
+                NIT_TEXTURE          =  1 << 15,
+                NIT_SNAPSHOT         =  1 << 16,
+                NIT_IMAGE            =  0x0018000,
 
                 /* Calling Cards */
-                NIT_CALLCARD_OFF     =  1 << 15,
-                NIT_CALLCARD_ON      =  1 << 16,
-                NIT_CALLCARD         =  0x0018000,
+                NIT_CALLCARD_OFF     =  1 << 17,
+                NIT_CALLCARD_ON      =  1 << 18,
+                NIT_CALLCARD         =  0x0060000,
 
                 /* Landmarks */
-                NIT_LANDMARK_UNUSED  =  1 << 17,
-                NIT_LANDMARK_USED    =  1 << 18,
-                NIT_LANDMARK         =  0x0060000,
+                NIT_LANDMARK_UNUSED  =  1 << 19,
+                NIT_LANDMARK_USED    =  1 << 20,
+                NIT_LANDMARK         =  0x0180000,
 
                 /* Sounds */
-                NIT_SOUND            =  1 << 19,
+                NIT_SOUND            =  1 << 21,
 
                 /* Animations */
-                NIT_ANIMATION        =  1 << 20,
+                NIT_ANIMATION        =  1 << 22,
 
                 /* Gestures */
-                NIT_GESTURE          =  1 << 21,
+                NIT_GESTURE          =  1 << 23,
 
                 /* Notecards */
-                NIT_NOTECARD         =  1 << 22,
+                NIT_NOTECARD         =  1 << 24,
 
                 /* Scripts */
-                NIT_SCRIPT_LSL2      =  1 << 23,
+                NIT_SCRIPT_LSL2      =  1 << 25,
 
                 /* Objects */
-                NIT_OBJECT           =  1 << 24,
+                NIT_OBJECT           =  1 << 26,
 
     /* Folders ("Categories" in the old type system) */
-    NIT_FOLDER           =  1 << 25,
+    NIT_FOLDER           =  1 << 27,
 
                 /* Bitwise OR-ing of all the above */
-                NIT_ALL              =  0x3ffffff,
+                NIT_ALL              =  0xfffffff,
         };
 
 
diff --git a/linden/indra/llinventory/llwearabletype.h b/linden/indra/llinventory/llwearabletype.h
index b0a40b2..7a5ecef 100644
--- a/linden/indra/llinventory/llwearabletype.h
+++ b/linden/indra/llinventory/llwearabletype.h
@@ -47,7 +47,9 @@ enum	EWearableType  // If you change this, update LLWearable::getTypeName(), get
         WT_UNDERSHIRT = 10,
         WT_UNDERPANTS = 11,
         WT_SKIRT        = 12,
-        WT_COUNT        = 13,
+        WT_ALPHA        = 13,
+        WT_TATTOO       = 14,
+        WT_COUNT        = 15,
         WT_INVALID      = 255
 };