Tweaks n changes

indra/newview/llvieweroctree.cpp

@@ -1195,6 +1195,12 @@ void LLOcclusionCullingGroup::doOcclusion(LLCamera* camera, const LLVector4a* sh
 			bounds[0].add(*shift);
 		}
 
+		F32 OCCLUSION_FUDGE_Z = SG_OCCLUSION_FUDGE; //<-- #Solution #2
+		if (LLDrawPool::POOL_WATER == mSpatialPartition->mDrawableType)
+		{
+			OCCLUSION_FUDGE_Z = 1.;
+		}
+
 		// Don't cull hole/edge water, unless we have the GL_ARB_depth_clamp extension
 		if (earlyFail(camera, bounds))
 		{
@@ -1254,7 +1260,7 @@ void LLOcclusionCullingGroup::doOcclusion(LLCamera* camera, const LLVector4a* sh
 						shader->uniform3fv(LLShaderMgr::BOX_CENTER, 1, bounds[0].getF32ptr());
 						shader->uniform3f(LLShaderMgr::BOX_SIZE, bounds[1][0]+SG_OCCLUSION_FUDGE, 
 																 bounds[1][1]+SG_OCCLUSION_FUDGE, 
-																 bounds[1][2]+SG_OCCLUSION_FUDGE);
+																 bounds[1][2]+OCCLUSION_FUDGE_Z);
 
 						if (!use_depth_clamp && mSpatialPartition->mDrawableType == LLDrawPool::POOL_VOIDWATER)
 						{

indra/newview/pipeline.cpp

@@ -9447,6 +9447,10 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                 mWaterDis.bindTarget();
                 mWaterDis.getViewport(gGLViewport);
 
+                gGL.setColorMask(true, true);
+                mWaterDis.clear();
+                gGL.setColorMask(true, false);
+
                 F32 water_dist = water_height * LLPipeline::sDistortionWaterClipPlaneMargin;
 
                 //clip out geometry on the same side of water as the camera w/ enough margin to not include the water geo itself,
@@ -9627,7 +9631,7 @@ void LLPipeline::renderShadow(glh::matrix4f& view, glh::matrix4f& proj, LLCamera
 	LLGLEnable cull(GL_CULL_FACE);
 
 	//enable depth clamping if available
-	//LLGLEnable depth_clamp(gGLManager.mHasDepthClamp ? GL_DEPTH_CLAMP : 0);
+	LLGLEnable depth_clamp(gGLManager.mHasDepthClamp ? GL_DEPTH_CLAMP : 0);
 
 	if (use_shader)
 	{