summaryrefslogtreecommitdiff
path: root/indra/newview/lldynamictexture.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-05-08 18:41:20 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-05-08 18:41:20 +0000
commit63e7894148fdc7064b422bf65a0b75ffcf293496 (patch)
tree4cca89d9da518f264001e7cb4950f453647f2e5f /indra/newview/lldynamictexture.cpp
parenta75b85112ffa4b7140561083c2e5de05fb510805 (diff)
QAR-570 maint-render-4 merge
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
-rw-r--r--indra/newview/lldynamictexture.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index cdb7531341..7b88349ef4 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -223,17 +223,18 @@ BOOL LLDynamicTexture::updateAllInstances()
glClear(GL_DEPTH_BUFFER_BIT);
gDisplaySwapBuffers = FALSE;
+
+ gGL.color4f(1,1,1,1);
dynamicTexture->preRender(); // Must be called outside of startRender()
- LLVertexBuffer::startRender();
-
if (dynamicTexture->render())
{
result = TRUE;
sNumRenders++;
}
- LLVertexBuffer::stopRender();
-
+ gGL.flush();
+ LLVertexBuffer::unbind();
+
dynamicTexture->postRender(result);
}
}