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, 41 insertions, 32 deletions

diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index bcc8472..7c867d2 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -767,6 +767,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
         mFullyLoadedInitialized(FALSE),
         mFullyLoaded(FALSE),
         mHasBakedHair( FALSE ),
+        mSupportsAlphaLayers(FALSE),
         mFirstSetActualBoobGravRan( false ),
         mFirstSetActualButtGravRan( false ),
         mFirstSetActualFatGravRan( false )
@@ -4706,14 +4707,9 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass)
 
         if (pass == AVATAR_RENDER_PASS_SINGLE)
         {
-                const bool should_alpha_mask = mHasBakedHair && isTextureDefined(TEX_HEAD_BAKED) && isTextureDefined(TEX_UPPER_BAKED)
-                                                                                && isTextureDefined(TEX_LOWER_BAKED)
-                                                                                && mBakedTextureData[BAKED_HEAD].mIsLoaded
-                                                                                && mBakedTextureData[BAKED_UPPER].mIsLoaded && mBakedTextureData[BAKED_LOWER].mIsLoaded
-                                                                                && mBakedTextureData[BAKED_HEAD].mIsUsed
-                                                                                && mBakedTextureData[BAKED_UPPER].mIsUsed && mBakedTextureData[BAKED_LOWER].mIsUsed
-                                                                                && !LLDrawPoolAlpha::sShowDebugAlpha // Don't alpha mask if "Highlight Transparent" checked
-                                                                                && !(isSelf() && gAgent.cameraCustomizeAvatar()); // don't alpha mask if in customize mode
+                const bool should_alpha_mask = mSupportsAlphaLayers && mHasBakedHair
+                                                                            && !LLDrawPoolAlpha::sShowDebugAlpha // Don't alpha mask if "Highlight Transparent" checked
+                                                                                && !LLDrawPoolAvatar::sSkipTransparent;
 
                 LLGLState test(GL_ALPHA_TEST, should_alpha_mask);
 
@@ -4826,27 +4822,25 @@ U32 LLVOAvatar::renderRigid()
                 return 0;
         }
 
-        if (isTextureVisible(TEX_EYES_BAKED) || mIsDummy)
-        {
-                // If the meshes need to be drawn, enable alpha masking but not blending
-                bool should_alpha_mask = mHasBakedHair
-                                        && mBakedTextureData[BAKED_EYES].mIsLoaded
-                                        && mBakedTextureData[BAKED_EYES].mIsUsed
-                                        && !(isSelf() && gAgent.cameraCustomizeAvatar());
+        const bool should_alpha_mask = mSupportsAlphaLayers && mHasBakedHair
+                                                                    && !LLDrawPoolAlpha::sShowDebugAlpha // Don't alpha mask if "Highlight Transparent" checked
+                                                                        && !LLDrawPoolAvatar::sSkipTransparent;
 
-                LLGLState test(GL_ALPHA_TEST, should_alpha_mask);
 
-                if (should_alpha_mask)
-                {
-                        gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
-                }
+        LLGLState test(GL_ALPHA_TEST, should_alpha_mask);
 
+        if (should_alpha_mask)
+        {
+                gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
+        }
+ 
+        if (isTextureVisible(TEX_EYES_BAKED) || mIsDummy)
+        {
                 num_indices += mMeshLOD[MESH_ID_EYEBALL_LEFT]->render(mAdjustedPixelArea, TRUE, mIsDummy);
                 num_indices += mMeshLOD[MESH_ID_EYEBALL_RIGHT]->render(mAdjustedPixelArea, TRUE, mIsDummy);
-
-                gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
         }
 
+        gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
         return num_indices;
 }
 
@@ -5019,6 +5013,7 @@ void LLVOAvatar::updateTextures()
                         // Spam if this is a baked texture, not set to default image, without valid host info
                         if (isIndexBakedTexture((ETextureIndex)index)
                                 && imagep->getID() != IMG_DEFAULT_AVATAR
+                                && imagep->getID() != IMG_INVISIBLE
                                 && !imagep->getTargetHost().isOk())
                         {
                                 LL_WARNS_ONCE("Texture") << "LLVOAvatar::updateTextures No host for texture "
@@ -5829,6 +5824,7 @@ BOOL LLVOAvatar::loadAvatar()
                                 if (layer_set->isBodyRegion(baked_dict->mName))
                                 {
                                         mBakedTextureData[baked_iter->first].mTexLayerSet = layer_set;
+                                        layer_set->setBakedTexIndex(baked_iter->first);
                                         found_baked_entry = true;
                                         break;
                                 }
@@ -7525,6 +7521,9 @@ void LLVOAvatar::updateMeshTextures()
 
         }
 
+        // Turn on alpha masking correctly for yourself and other avatars on 1.23+
+        mSupportsAlphaLayers = isSelf() || is_layer_baked[BAKED_HAIR];
+
         // Baked textures should be requested from the sim this avatar is on. JC
         const LLHost target_host = getObjectHost();
         if (!target_host.isOk())
@@ -7554,7 +7553,7 @@ void LLVOAvatar::updateMeshTextures()
                         else
                         {
                                 mBakedTextureData[i].mIsLoaded = FALSE;
-                                if ( (i == BAKED_HEAD) || (i == BAKED_UPPER) || (i == BAKED_LOWER) )
+                                if ((baked_img->getID() != IMG_INVISIBLE) && (i == BAKED_HEAD || i == BAKED_UPPER || i == BAKED_LOWER))
                                 {
                                         baked_img->setLoadedCallback(onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, TRUE, new LLTextureMaskData( mID ));
                                 }
@@ -7826,7 +7825,13 @@ void LLVOAvatar::setNewBakedTexture( ETextureIndex te, const LLUUID& uuid )
         // Baked textures live on other sims.
         LLHost target_host = getObjectHost();
         setTEImage( te, gImageList.getImageFromHost( uuid, target_host ) );
-        updateMeshTextures();
+        if (uuid != IMG_INVISIBLE)
+        {
+                // Do not update textures when setting a new invisible baked texture as
+                // it would result in destroying the calling object (setNewBakedTexture()
+                // is called by LLTexLayerSetBuffer::render()) !
+                updateMeshTextures();
+        }
         dirtyMesh();
 
 
@@ -7839,7 +7844,7 @@ void LLVOAvatar::setNewBakedTexture( ETextureIndex te, const LLUUID& uuid )
         if (text_dict->mIsBakedTexture)
         {
                 llinfos << "New baked texture: " << text_dict->mName << " UUID: " << uuid <<llendl;
-                mBakedTextureData[text_dict->mBakedTextureIndex].mTexLayerSet->requestUpdate();
+                //mBakedTextureData[text_dict->mBakedTextureIndex].mTexLayerSet->requestUpdate();
         }
         else
         {
@@ -8087,6 +8092,10 @@ void LLVOAvatar::dumpAvatarTEs( const std::string& context )
                 {
                         llinfos << "       " << text_dict->mName << ": IMG_DEFAULT" << llendl;
                 }
+                else if (te_image->getID() == IMG_INVISIBLE)
+                {
+                        llinfos << "       " << text_dict->mName << ": IMG_INVISIBLE" << llendl;
+                }
                 else if( te_image->getID() == IMG_DEFAULT_AVATAR )
                 {
                         llinfos << "       " << text_dict->mName << ": IMG_DEFAULT_AVATAR" << llendl;
@@ -8258,11 +8267,11 @@ BOOL LLVOAvatar::isWearingWearableType( EWearableType type )
 }
 
 //-----------------------------------------------------------------------------
-// updatedWearable( EWearableType type )
+// wearableUpdated(EWearableType type, BOOL upload_result)
 // forces an update to any baked textures relevant to type.
-// Should be called only on saving the wearable
+// will force an upload of the resulting bake if the second parameter is TRUE
 //-----------------------------------------------------------------------------
-void LLVOAvatar::wearableUpdated( EWearableType type )
+void LLVOAvatar::wearableUpdated(EWearableType type, BOOL upload_result)
 {
         for (LLVOAvatarDictionary::wearable_map_t::const_iterator wearable_iter = LLVOAvatarDictionary::getInstance()->getWearables().begin();
                 wearable_iter != LLVOAvatarDictionary::getInstance()->getWearables().end();
@@ -8281,8 +8290,8 @@ void LLVOAvatar::wearableUpdated( EWearableType type )
                                 {
                                         if (mBakedTextureData[index].mTexLayerSet)
                                         {
-                                                mBakedTextureData[index].mTexLayerSet->requestUpdate();
-                                                mBakedTextureData[index].mTexLayerSet->requestUpload();
+                                                invalidateComposite(mBakedTextureData[index].mTexLayerSet, upload_result);
+                                                updateMeshTextures();
                                         }
                                         break;
                                 }
@@ -8381,7 +8390,7 @@ void LLVOAvatar::onFirstTEMessageReceived()
                                 LLViewerImage* image = getTEImage( mBakedTextureData[i].mTextureIndex );
                                 mBakedTextureData[i].mLastTextureIndex = image->getID();
                                 // If we have more than one texture for the other baked layers, we'll want to call this for them too.
-                                if ( (i == BAKED_HEAD) || (i == BAKED_UPPER) || (i == BAKED_LOWER) )
+                                if ((image->getID() != IMG_INVISIBLE) && (i == BAKED_HEAD || i == BAKED_UPPER || i == BAKED_LOWER))
                                 {
                                         image->setLoadedCallback( onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, TRUE, new LLTextureMaskData( mID ));
                                 }
@@ -8653,7 +8662,7 @@ void LLVOAvatar::onBakedTextureMasksLoaded( BOOL success, LLViewerImage *src_vi,
                                 {
                                         const ETextureIndex texture_index = iter->first;
                                         const LLViewerImage *baked_img = self->getTEImage(texture_index);
-                                        if (id == baked_img->getID())
+                                        if (baked_img && id == baked_img->getID())
                                         {
                                                 const EBakedTextureIndex baked_index = text_dict->mBakedTextureIndex;
                                                 if (self->mBakedTextureData[baked_index].mTexLayerSet)