diff options
author | Dave Parks <davep@lindenlab.com> | 2010-03-19 14:34:49 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-03-19 14:34:49 -0500 |
commit | 16b5db66419fdad8a8f958fd4e542c96429965ae (patch) | |
tree | 7eba8b1c78727427d7cd752e87500970c72d338f /indra/newview/pipeline.cpp | |
parent | 4a12ace4f58c7cc432dcefe408c72285e9e81d12 (diff) |
Replace usage of RenderWaterReflections with RenderReflectionDetail.
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r-- | indra/newview/pipeline.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index ee5ed32a83..e61dff139e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7313,17 +7313,16 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) (1<<LLPipeline::RENDER_TYPE_SKY) | (1<<LLPipeline::RENDER_TYPE_CLOUDS)); - if (gSavedSettings.getBOOL("RenderWaterReflections")) + S32 detail = gSavedSettings.getS32("RenderReflectionDetail"); + if (detail > 0) { //mask out selected geometry based on reflection detail - - S32 detail = gSavedSettings.getS32("RenderReflectionDetail"); - if (detail < 3) + if (detail < 4) { mRenderTypeMask &= ~(1 << LLPipeline::RENDER_TYPE_PARTICLES); - if (detail < 2) + if (detail < 3) { mRenderTypeMask &= ~(1 << LLPipeline::RENDER_TYPE_AVATAR); - if (detail < 1) + if (detail < 2) { mRenderTypeMask &= ~(1 << LLPipeline::RENDER_TYPE_VOLUME); } @@ -7343,7 +7342,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) if (LLDrawPoolWater::sNeedsDistortionUpdate) { mRenderTypeMask = ref_mask; - if (gSavedSettings.getBOOL("RenderWaterReflections")) + if (gSavedSettings.getS32("RenderReflectionDetail") > 0) { gPipeline.grabReferences(ref_result); LLGLUserClipPlane clip_plane(plane, mat, projection); |