summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2012-01-18 15:26:30 -0700
committerXiaohong Bao <bao@lindenlab.com>2012-01-18 15:26:30 -0700
commit05cff1ad7f71f6ca74af44bdcf1f119cd5149b93 (patch)
treee23215f43f0ef0a5eab1d78809b69221a501b29d /indra/newview/pipeline.cpp
parent3ed8f8907665d8700199a1181a5dd106a6804edb (diff)
fix for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 8449e74fb6..737c5b51a2 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -3765,6 +3765,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
LLAppViewer::instance()->pingMainloopTimeout("Pipeline:ForceVBO");
// Initialize lots of GL state to "safe" values
+ gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
gGL.matrixMode(LLRender::MM_TEXTURE);
gGL.loadIdentity();
gGL.matrixMode(LLRender::MM_MODELVIEW);