merged in recent changes

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index cc34285d65..1022c23f7b 100755
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -468,7 +468,7 @@ void main()
 				envIntensity);  
 
 		}
-	
+						
 		if (norm.w < 0.5)
 		{
 			col = mix(atmosLighting(col), fullbrightAtmosTransport(col), diffuse.a);
@@ -486,7 +486,7 @@ void main()
 		//col = vec3(1,0,1);
 		//col.g = envIntensity;
 	}
-
+	
 	frag_color.rgb = col;
 	frag_color.a = bloom;
 }