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.

1 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 0bf648a..1914f47 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -39,6 +39,7 @@
 #include <string>
 #include <vector>
 
+#include "imageids.h"                   // IMG_INVISIBLE
 #include "llchat.h"
 #include "lldrawpoolalpha.h"
 #include "llviewerobject.h"
@@ -342,7 +343,7 @@ public:
         BOOL                    teToColorParams( LLVOAvatarDefines::ETextureIndex te, const char* param_name[3] );
 
         BOOL                    isWearingWearableType( EWearableType type );
-        void                    wearableUpdated( EWearableType type );
+        void                    wearableUpdated(EWearableType type, BOOL upload_result = TRUE);
 
         //--------------------------------------------------------------------
         // texture compositing
@@ -602,6 +603,7 @@ private:
         BOOL mIsBuilt; // state of deferred character building
         F32 mSpeedAccum; // measures speed (for diagnostics mostly).
 
+        BOOL mSupportsAlphaLayers; // For backwards compatibility, TRUE for 1.23+ clients
         
         // LLFrameTimer mUpdateLODTimer; // controls frequency of LOD change calculations
         BOOL mDirtyMesh;
@@ -827,7 +829,7 @@ inline BOOL LLVOAvatar::isTextureDefined(U8 te) const
 
 inline BOOL LLVOAvatar::isTextureVisible(U8 te) const
 {
-        return ((isTextureDefined(te) || isSelf())
+        return ((isTextureDefined(te) || mIsSelf)
                         && (getTEImage(te)->getID() != IMG_INVISIBLE 
                                 || LLDrawPoolAlpha::sShowDebugAlpha));
 }