From 16baf6c9d43fc29e697b5a460439ca664897450c Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Mon, 28 Apr 2008 23:29:46 +0000 Subject: merge release-QAR-499 Viewer 1.20 RC 3 merge release-QAR-508 Viewer 1.20 RC 4 merge Branch_1-20-Viewer -r 85278 : 85828 -> release --- indra/newview/lldynamictexture.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'indra/newview/lldynamictexture.cpp') diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index 24ee701ff2..cdb7531341 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -223,17 +223,15 @@ BOOL LLDynamicTexture::updateAllInstances() glClear(GL_DEPTH_BUFFER_BIT); gDisplaySwapBuffers = FALSE; - LLVertexBuffer::startRender(); - gGL.start(); - dynamicTexture->preRender(); // Must be called outside of startRender() + LLVertexBuffer::startRender(); + if (dynamicTexture->render()) { result = TRUE; sNumRenders++; } - gGL.stop(); LLVertexBuffer::stopRender(); dynamicTexture->postRender(result); -- cgit v1.2.3