summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2009-07-31 17:51:39 +0000
committerXiaohong Bao <bao@lindenlab.com>2009-07-31 17:51:39 +0000
commit3c85899ee0db4a90d03ec687e514a31c1befe34e (patch)
tree509c3bba2c41e345d358a1d2a6215515ed0206c7
parente6240500a95559f6df4d6b711d0c01c706e13e58 (diff)
for DEV-33077 partially: don't call analyzeAlpha for media textures.
-rw-r--r--indra/newview/llviewertexture.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 533889b2f7..6ea1522b47 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1940,6 +1940,8 @@ LLViewerMediaTexture::LLViewerMediaTexture(const LLUUID& id, BOOL usemipmaps, LL
{
generateGLTexture() ;
}
+ mGLTexturep->setNeedsAlphaAndPickMask(FALSE) ;
+
mIsPlaying = FALSE ;
}
@@ -1952,6 +1954,7 @@ void LLViewerMediaTexture::reinit(BOOL usemipmaps /* = TRUE */)
getLastReferencedTimer()->reset() ;
generateGLTexture() ;
+ mGLTexturep->setNeedsAlphaAndPickMask(FALSE) ;
}
void LLViewerMediaTexture::setUseMipMaps(BOOL mipmap)