merge

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 82a29bbbe9..5f74423c7b 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -8785,7 +8785,7 @@ void LLPipeline::generateSunShadow(LLCamera& camera)
 		near_clip = -max.mV[2];

 		F32 far_clip = -min.mV[2]*2.f;

 

-		far_clip = llmin(far_clip, 128.f);

+		//far_clip = llmin(far_clip, 128.f);

 		far_clip = llmin(far_clip, camera.getFar());

 

 		F32 range = far_clip-near_clip;

@@ -9135,7 +9135,7 @@ void LLPipeline::generateSunShadow(LLCamera& camera)
 			}

 		}

 

-		shadow_cam.setFar(128.f);

+		//shadow_cam.setFar(128.f);

 		shadow_cam.setOriginAndLookAt(eye, up, center);

 

 		shadow_cam.setOrigin(0,0,0);