diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-24 22:01:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-24 22:01:34 -0400 |
| commit | 3e8dab32ee88e0a6fda51c218c61d718cf9dcafa (patch) | |
| tree | 5a3997aff0f0ddc7e1d6c5ec06441c5f2db05772 /indra | |
| parent | 1d01ad116220503ac688641d939a8fee095f817b (diff) | |
| parent | 08a621f0509bc6232e2ca1da0b0017ecd365f3ff (diff) | |
merge changes for DRTVWR-154
Diffstat (limited to 'indra')
| -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; } |