diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-02-18 13:52:56 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-02-18 13:52:56 -0600 |
| commit | add08538af7bc6c19507835688ac6f970184bb6f (patch) | |
| tree | d554e9d5211d444a451da11023c06b20714f0179 | |
| parent | dfafbf9f122c55f80be443a7fe944c1b3c4a9b40 (diff) | |
| parent | cfb3ee50c23c32dc0470d8e6bf1a2527d2d425bd (diff) | |
merge
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 97d6a222c5..b45d1aa3a6 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -616,10 +616,10 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) && gSavedSettings.getBOOL("UseOcclusion")
&& gGLManager.mHasOcclusionQuery) ? 2 : 0;
- if (LLPipeline::sUseOcclusion && LLPipeline::sRenderDeferred)
- { //force occlusion on for all render types if doing deferred render
+ /*if (LLPipeline::sUseOcclusion && LLPipeline::sRenderDeferred)
+ { //force occlusion on for all render types if doing deferred render (tighter shadow frustum)
LLPipeline::sUseOcclusion = 3;
- }
+ }*/
LLPipeline::sAutoMaskAlphaDeferred = gSavedSettings.getBOOL("RenderAutoMaskAlphaDeferred");
LLPipeline::sAutoMaskAlphaNonDeferred = gSavedSettings.getBOOL("RenderAutoMaskAlphaNonDeferred");
|