diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-28 13:50:35 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-28 13:50:35 -0500 |
| commit | db5d1b851a0d808dc1e8b0896fad734c2c54a03f (patch) | |
| tree | ebe50ddb5e1aa700d54f50bbc1ab4b435462b85e /indra/newview/lldynamictexture.cpp | |
| parent | 1d8f117069945499ac297ef13eb6a916a2b96d72 (diff) | |
| parent | ed72fd0ae98671f1cfce3c975b93e1f760fc40f0 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
| -rw-r--r-- | 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 100644 --- 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; } |