diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-29 12:42:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-29 12:42:53 -0400 |
| commit | 81870e09c98da59bf64289e3fe46f4e4281876d3 (patch) | |
| tree | d9e1a28b3e0e732c6b32d2ea67f5f56de6bc8a7a /indra/newview/llviewertexture.cpp | |
| parent | b2baee8e34a141c28fd2a7b60566558c1019c0a9 (diff) | |
| parent | 5db5102fe05f7d2ef3535516da269abb276dad6b (diff) | |
merge changes for DRTVWR-148
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index ea329f6aac..d844aeb12a 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -3343,10 +3343,14 @@ LLViewerMediaTexture::LLViewerMediaTexture(const LLUUID& id, BOOL usemipmaps, LL sMediaMap.insert(std::make_pair(id, this)); mGLTexturep = gl_image ; + if(mGLTexturep.isNull()) { generateGLTexture() ; } + + mGLTexturep->setAllowCompression(false); + mGLTexturep->setNeedsAlphaAndPickMask(FALSE) ; mIsPlaying = FALSE ; |