summaryrefslogtreecommitdiff
path: root/indra/newview/llviewershadermgr.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-11-04 18:10:29 -0700
committerMerov Linden <merov@lindenlab.com>2010-11-04 18:10:29 -0700
commit4bbe823302427a705ea541d968f6058571a13c2f (patch)
treed932a7a3483b674a7600b0e4bff3d0bda3344b35 /indra/newview/llviewershadermgr.cpp
parentba3307b8d0f2ceb40454174a6593f3f98ce98b65 (diff)
parentf7af29ab40c2405504969a453eba3919be1af5c5 (diff)
merge with STORM-105
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r--indra/newview/llviewershadermgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index d078c15316..c1abead36e 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -335,8 +335,8 @@ void LLViewerShaderMgr::setShaders()
}
else
{
- LLPipeline::sRenderGlow =
- LLPipeline::sWaterReflections = FALSE;
+ LLPipeline::sRenderGlow = FALSE;
+ LLPipeline::sWaterReflections = FALSE;
}
//hack to reset buffers that change behavior with shaders