summaryrefslogtreecommitdiff
path: root/indra/newview/llviewershadermgr.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2010-10-28 13:54:43 -0400
committerprep <prep@lindenlab.com>2010-10-28 13:54:43 -0400
commita91bff4036bbdd0f32722ed573f9f44ab00f00f0 (patch)
treea2ee17189b530ace49c886d8a8acc4deb32620b5 /indra/newview/llviewershadermgr.cpp
parent53d5fd1e9bb59868b793f9bef0529cd62ca70126 (diff)
parent32bcdd11990e1fa5126a15a2bd22249162c0806a (diff)
merge
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 1161810c68..6231822fe7 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -362,8 +362,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