Merge commit 'e7eced3' into release/luau-scripting: whitespace fix.

1 files changed, 9 insertions, 9 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl
index b35d10c8a0..6f45adc68d 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file starsF.glsl
  *
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2007, 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$
  */
@@ -44,15 +44,15 @@ float twinkle(){
 // See:
 // ALM off: class1/environment/starsF.glsl
 // ALM on : class1/deferred/starsF.glsl
-void main() 
+void main()
 {
-	// camera above water: class1\deferred\starsF.glsl
-	// camera below water: class1\environment\starsF.glsl
+    // camera above water: class1\deferred\starsF.glsl
+    // camera below water: class1\environment\starsF.glsl
     vec4 col_a = texture(diffuseMap, vary_texcoord0.xy);
     vec4 col_b = texture(diffuseMap, vary_texcoord0.xy);
     vec4 col = mix(col_b, col_a, blend_factor);
     col.rgb *= vertex_color.rgb;
- 
+
     float factor = smoothstep(0.0f, 0.9f, custom_alpha);
 
     col.a = (col.a * factor) * 32.0f;