summaryrefslogtreecommitdiff
path: root/indra/newview/llviewershadermgr.cpp
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2010-11-01 15:19:50 -0700
committerMark Palange (Mani) <palange@lindenlab.com>2010-11-01 15:19:50 -0700
commit9b457982305c624468aa32e06a1c0df713d0b53c (patch)
treef6a8787782355e3ea083326ff3e1ea4ad4bc8873 /indra/newview/llviewershadermgr.cpp
parent6ab2e44e945ddc085a7b4b5f1524de924419a897 (diff)
parent42b49397d2347b6a97394ce0b35efe5cc2ab44a2 (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 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