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/lltexlayer.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/lltexlayer.cpp') diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 7a2d232de6..f8931cb18b 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -244,6 +244,8 @@ BOOL LLTexLayerSetBuffer::render() BOOL upload_now = (gAgent.mNumPendingQueries == 0 && mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal()); BOOL success = TRUE; + gGL.start(); + // Composite bump if( mBumpTexName ) { @@ -295,6 +297,8 @@ BOOL LLTexLayerSetBuffer::render() glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE ); gGL.blendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); + gGL.stop(); + // we have valid texture data now mInitialized = TRUE; mNeedsUpdate = FALSE; -- cgit v1.2.3