diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index fe837cc3dea6e6af36d93d2e44847c5ff317d887..83bc6b85d5384bf323234774da94c0f36eae68a4 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -9345,63 +9345,63 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
 				//initial sky pass (no user clip plane)
 				{ //mask out everything but the sky
 					gPipeline.pushRenderTypeMask();
-
-                    if (reflection_detail >= WATER_REFLECT_MINIMAL)
-                    {
-                        gPipeline.andRenderTypeMask(
-                            LLPipeline::RENDER_TYPE_SKY,
-                            LLPipeline::RENDER_TYPE_WL_SKY,
-                            LLPipeline::RENDER_TYPE_CLOUDS,
-                            LLPipeline::END_RENDER_TYPES);
-                    }
-                    else
                     {
-                        gPipeline.andRenderTypeMask(
-                            LLPipeline::RENDER_TYPE_SKY,
-                            LLPipeline::RENDER_TYPE_WL_SKY,
-                            LLPipeline::END_RENDER_TYPES);
-                    }
-
-                    updateCull(camera, mSky);
-                    stateSort(camera, mSky);
-                    renderGeom(camera, TRUE);
+                        if (reflection_detail >= WATER_REFLECT_MINIMAL)
+                        {
+                            gPipeline.andRenderTypeMask(
+                                LLPipeline::RENDER_TYPE_SKY,
+                                LLPipeline::RENDER_TYPE_WL_SKY,
+                                LLPipeline::RENDER_TYPE_CLOUDS,
+                                LLPipeline::END_RENDER_TYPES);
+                        }
+                        else
+                        {
+                            gPipeline.andRenderTypeMask(
+                                LLPipeline::RENDER_TYPE_SKY,
+                                LLPipeline::RENDER_TYPE_WL_SKY,
+                                LLPipeline::END_RENDER_TYPES);
+                        }
 
-					gPipeline.popRenderTypeMask();
+                        updateCull(camera, mSky);
+                        stateSort(camera, mSky);
+                        renderGeom(camera, TRUE);
+                    }
+                    gPipeline.popRenderTypeMask();
 				}
 
                 if (reflection_detail >= WATER_REFLECT_NONE_WATER_TRANSPARENT)
                 {
                     gPipeline.pushRenderTypeMask();
+                    {
+                        clearRenderTypeMask(LLPipeline::RENDER_TYPE_WATER,
+                            LLPipeline::RENDER_TYPE_VOIDWATER,
+                            LLPipeline::RENDER_TYPE_GROUND,
+                            LLPipeline::RENDER_TYPE_SKY,
+                            LLPipeline::RENDER_TYPE_CLOUDS,
+                            LLPipeline::END_RENDER_TYPES);
 
-                    clearRenderTypeMask(LLPipeline::RENDER_TYPE_WATER,
-                        LLPipeline::RENDER_TYPE_VOIDWATER,
-                        LLPipeline::RENDER_TYPE_GROUND,
-                        LLPipeline::RENDER_TYPE_SKY,
-                        LLPipeline::RENDER_TYPE_CLOUDS,
-                        LLPipeline::END_RENDER_TYPES);
-
-                    if (reflection_detail > WATER_REFLECT_MINIMAL)
-                    { //mask out selected geometry based on reflection detail
-                        if (reflection_detail < WATER_REFLECT_EVERYTHING)
-                        {
-                            clearRenderTypeMask(LLPipeline::RENDER_TYPE_PARTICLES, END_RENDER_TYPES);
-                            if (reflection_detail < WATER_REFLECT_AVATARS)
+                        if (reflection_detail > WATER_REFLECT_MINIMAL)
+                        { //mask out selected geometry based on reflection detail
+                            if (reflection_detail < WATER_REFLECT_EVERYTHING)
                             {
-                                clearRenderTypeMask(LLPipeline::RENDER_TYPE_AVATAR, LLPipeline::RENDER_TYPE_CONTROL_AV, END_RENDER_TYPES);
-                                if (reflection_detail < WATER_REFLECT_STATIC_OBJECTS)
+                                clearRenderTypeMask(LLPipeline::RENDER_TYPE_PARTICLES, END_RENDER_TYPES);
+                                if (reflection_detail < WATER_REFLECT_AVATARS)
                                 {
-                                    clearRenderTypeMask(LLPipeline::RENDER_TYPE_VOLUME, END_RENDER_TYPES);
+                                    clearRenderTypeMask(LLPipeline::RENDER_TYPE_AVATAR, LLPipeline::RENDER_TYPE_CONTROL_AV, END_RENDER_TYPES);
+                                    if (reflection_detail < WATER_REFLECT_STATIC_OBJECTS)
+                                    {
+                                        clearRenderTypeMask(LLPipeline::RENDER_TYPE_VOLUME, END_RENDER_TYPES);
+                                    }
                                 }
                             }
-                        }
 
-                        LLGLUserClipPlane clip_plane(plane, mReflectionModelView, saved_projection);
-                        LLGLDisable cull(GL_CULL_FACE);
-                        updateCull(camera, mReflectedObjects, -water_clip, &plane);
-                        stateSort(camera, mReflectedObjects);
-                        renderGeom(camera);
+                            LLGLUserClipPlane clip_plane(plane, mReflectionModelView, saved_projection);
+                            LLGLDisable cull(GL_CULL_FACE);
+                            updateCull(camera, mReflectedObjects, -water_clip, &plane);
+                            stateSort(camera, mReflectedObjects);
+                            renderGeom(camera);
+                        }
                     }
-
                     gPipeline.popRenderTypeMask();
                 }