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, 5 insertions, 1 deletions

diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index f4476fb..635c2b0 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -1322,7 +1322,11 @@ void LLTextureCtrl::draw()
                 mTexturep = gImageList.getImageFromFile(mFallbackImageName);
                 mTexturep->setBoostLevel(LLViewerImageBoostLevel::BOOST_PREVIEW);
         }
-        
+        else    // mImageAssetID == LLUUID::null
+        {
+                mTexturep = NULL;
+        }
+
         // Border
         LLRect border( 0, getRect().getHeight(), getRect().getWidth(), BTN_HEIGHT_SMALL );
         gl_rect_2d( border, mBorderColor, FALSE );