diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-05 19:41:52 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-05 19:41:52 +0100 |
commit | f413146843a9de666087a8f3dd26e4dd191bd9f2 (patch) | |
tree | 64c69341c014a9a739d90feb7fed6534cb61877f /indra/newview/pipeline.cpp | |
parent | 8d9c7855ddbe3f4666a293f29f4d6c89730d10c5 (diff) | |
parent | f4e7383aa51ed26197f5068f89da365e4727f06e (diff) |
merge from viewer-public
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 086c2f702c..4fbc6bb5da 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -266,7 +266,7 @@ BOOL LLPipeline::sRenderParticleBeacons = FALSE; BOOL LLPipeline::sRenderSoundBeacons = FALSE; BOOL LLPipeline::sRenderBeacons = FALSE; BOOL LLPipeline::sRenderHighlight = TRUE; -BOOL LLPipeline::sForceOldBakedUpload = TRUE; +BOOL LLPipeline::sForceOldBakedUpload = FALSE; S32 LLPipeline::sUseOcclusion = 0; BOOL LLPipeline::sDelayVBUpdate = TRUE; BOOL LLPipeline::sAutoMaskAlphaDeferred = TRUE; |