diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-27 11:33:19 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-27 11:33:19 -0400 |
| commit | 1f234f8593cb556d6515b7bbf3ac99d19fa4c5c3 (patch) | |
| tree | 16d26c0c5af67114eec8f91a853cc5e0356b4131 /indra/newview/lldynamictexture.cpp | |
| parent | 99c1c64aa494c0b9085f0766b951fedfb60ce412 (diff) | |
| parent | 0730b24d7cb0a0ce0d6d08bc4e98387124bf03d0 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
| -rwxr-xr-x | indra/newview/lldynamictexture.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index a93b2b71de..bf8338e5f2 100755 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -216,12 +216,14 @@ BOOL LLViewerDynamicTexture::updateAllInstances() return TRUE; } +#if 0 //THIS CAUSES MAINT-1092 bool use_fbo = gGLManager.mHasFramebufferObject && gPipeline.mWaterDis.isComplete(); if (use_fbo) { gPipeline.mWaterDis.bindTarget(); } +#endif LLGLSLShader::bindNoShader(); LLVertexBuffer::unbind(); @@ -256,10 +258,12 @@ BOOL LLViewerDynamicTexture::updateAllInstances() } } +#if 0 if (use_fbo) { gPipeline.mWaterDis.flush(); } +#endif return ret; } |