summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-07-22 12:54:31 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-07-22 12:54:31 -0600
commit10c6121db67bae2837bfac82efa4c60209d1f5df (patch)
tree29f5ed9a7190ad17bbb18bd4d3afd2c5204999e3 /indra/newview
parentd2d84a1c995ca9fb588e0982734397c0388a19a8 (diff)
parent5f400b3b7c9bb88dd89c8149ebca7645e71108d2 (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lldynamictexture.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index c423473740..bb4e6c7a3e 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -167,6 +167,10 @@ void LLViewerDynamicTexture::postRender(BOOL success)
{
generateGLTexture() ;
}
+ if(!mGLTexturep->getHasGLTexture())
+ {
+ generateGLTexture() ;
+ }
llcallstacks << "class type: " << (S32)getType() << llcallstacksendl ;
success = mGLTexturep->setSubImageFromFrameBuffer(0, 0, mOrigin.mX, mOrigin.mY, mFullWidth, mFullHeight);