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 | bee8774886a6258cc20f7a065e62d099ab7098ca (patch) | |
| tree | 34cb2237337e39ea09422a8e365bba105cb3fb88 /indra/newview/pipeline.cpp | |
| parent | 97d13488d6213b9413f010e751e5032193d74904 (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 674f2fe58c..8b9f33e88e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7238,17 +7238,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); } @@ -7268,7 +7267,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); |