Second Life viewer sources 1.23.2-RC

1 files changed, 14 insertions, 3 deletions

diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 3491dd3..168b005 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -769,6 +769,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
                 mBakedTextureData[i].mLastTextureIndex = IMG_DEFAULT_AVATAR;
                 mBakedTextureData[i].mTexLayerSet = NULL;
                 mBakedTextureData[i].mIsLoaded = false;
+                mBakedTextureData[i].mIsUsed = false;
                 mBakedTextureData[i].mMaskTexName = 0;
                 mBakedTextureData[i].mTextureIndex = getTextureIndex((EBakedTextureIndex)i);
         }
@@ -4151,8 +4152,11 @@ 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
+                                                                                && 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
 
@@ -4270,7 +4274,11 @@ U32 LLVOAvatar::renderRigid()
         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 && !(isSelf() && gAgent.cameraCustomizeAvatar());
+                bool should_alpha_mask = mHasBakedHair 
+                                        && mBakedTextureData[BAKED_EYES].mIsLoaded
+                                        && mBakedTextureData[BAKED_EYES].mIsUsed
+                                        && !(isSelf() && gAgent.cameraCustomizeAvatar());
+
                 LLGLState test(GL_ALPHA_TEST, should_alpha_mask);
                 
                 if (should_alpha_mask)
@@ -6905,6 +6913,7 @@ void LLVOAvatar::updateMeshTextures()
                 if (use_lkg_baked_layer[i] && !self_customizing )
                 {
                         LLViewerImage* baked_img = gImageList.getImageFromHost( mBakedTextureData[i].mLastTextureIndex, target_host );
+                        mBakedTextureData[i].mIsUsed = TRUE;
                         for (U32 k=0; k < mBakedTextureData[i].mMeshes.size(); k++)
                         {
                                 mBakedTextureData[i].mMeshes[k]->setTexture( baked_img );
@@ -6934,6 +6943,7 @@ void LLVOAvatar::updateMeshTextures()
                 {
                         mBakedTextureData[i].mTexLayerSet->createComposite();
                         mBakedTextureData[i].mTexLayerSet->setUpdatesEnabled( TRUE );
+                        mBakedTextureData[i].mIsUsed = FALSE;                   
                         for (U32 k=0; k < mBakedTextureData[i].mMeshes.size(); k++)
                         {
                                 mBakedTextureData[i].mMeshes[k]->setLayerSet( mBakedTextureData[i].mTexLayerSet );
@@ -6944,7 +6954,7 @@ void LLVOAvatar::updateMeshTextures()
         // ! BACKWARDS COMPATIBILITY !
         // Workaround for viewing avatars from old viewers that haven't baked hair textures.
         // if (!isTextureDefined(mBakedTextureData[BAKED_HAIR].mTextureIndex))
-        if (!is_layer_baked[BAKED_HAIR])
+        if (!is_layer_baked[BAKED_HAIR] || self_customizing)
         {
                 const LLColor4 color = mTexHairColor ? mTexHairColor->getColor() : LLColor4(1,1,1,1);
                 LLViewerImage* hair_img = getTEImage( TEX_HAIR );
@@ -8096,6 +8106,7 @@ void LLVOAvatar::useBakedTexture( const LLUUID& id )
                 if (id == image_baked->getID())
                 {
                         mBakedTextureData[i].mIsLoaded = true;
+                        mBakedTextureData[i].mIsUsed = true;
                         mBakedTextureData[i].mLastTextureIndex = id;
                         for (U32 k = 0; k < mBakedTextureData[i].mMeshes.size(); k++)
                         {