Merge branch 'release/maint-b' into nat/maint-b-tests

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl
index 4dc67028d5..77324edcff 100644
--- a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl
+++ b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file class1\lighting\lightAlphaMaskNonIndexedF.glsl
  *
  * $LicenseInfo:firstyear=2011&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2011, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -35,21 +35,21 @@ vec3 scaleSoftClip(vec3 light);
 in vec4 vertex_color;
 in vec2 vary_texcoord0;
 
-void default_lighting() 
+void default_lighting()
 {
-	vec4 color = texture(diffuseMap,vary_texcoord0.xy);
+    vec4 color = texture(diffuseMap,vary_texcoord0.xy);
 
-	if (color.a < minimum_alpha)
-	{
-		discard;
-	}
+    if (color.a < minimum_alpha)
+    {
+        discard;
+    }
 
-	color *= vertex_color;
+    color *= vertex_color;
 
-	color.rgb = atmosLighting(color.rgb);
+    color.rgb = atmosLighting(color.rgb);
 
-	color.rgb = scaleSoftClip(color.rgb);
+    color.rgb = scaleSoftClip(color.rgb);
 
-	frag_color = max(color, vec4(0));
+    frag_color = max(color, vec4(0));
 }