Merge tag '7.1.7-release'

source for viewer 7.1.7.8974243247

4 files changed, 67 insertions, 67 deletions

diff --git a/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl b/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl
index 97b3c2e2ea..32e63d97a8 100644
--- a/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl
+++ b/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl
@@ -1,28 +1,28 @@
-/** 
+/**
  * @file glowExtractF.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$
  */
- 
+
 /*[EXTRA_CODE_HERE]*/
 
 out vec4 frag_color;
@@ -42,12 +42,12 @@ in vec2 vary_texcoord0;
 
 void main()
 {
-	vec4 col = texture(diffuseMap, vary_texcoord0.xy);	
-	/// CALCULATING LUMINANCE (Using NTSC lum weights)
-	/// http://en.wikipedia.org/wiki/Luma_%28video%29
-	float lum = smoothstep(minLuminance, minLuminance+1.0, dot(col.rgb, lumWeights ) );
-	float warmth = smoothstep(minLuminance, minLuminance+1.0, max(col.r * warmthWeights.r, max(col.g * warmthWeights.g, col.b * warmthWeights.b)) ); 
-	
+    vec4 col = texture(diffuseMap, vary_texcoord0.xy);
+    /// CALCULATING LUMINANCE (Using NTSC lum weights)
+    /// http://en.wikipedia.org/wiki/Luma_%28video%29
+    float lum = smoothstep(minLuminance, minLuminance+1.0, dot(col.rgb, lumWeights ) );
+    float warmth = smoothstep(minLuminance, minLuminance+1.0, max(col.r * warmthWeights.r, max(col.g * warmthWeights.g, col.b * warmthWeights.b)) );
+
 #if HAS_NOISE
     float TRUE_NOISE_RES = 128.0; // See mTrueNoiseMap
     // *NOTE: Usually this is vary_fragcoord not vary_texcoord0, but glow extraction is in screen space
@@ -57,7 +57,7 @@ void main()
     col.rgb += glow_noise / NOISE_DEPTH;
     col.rgb = max(col.rgb, vec3(0.0));
 #endif
-	frag_color.rgb = col.rgb;
-	frag_color.a = max(col.a, mix(lum, warmth, warmthAmount) * maxExtractAlpha);
-	
+    frag_color.rgb = col.rgb;
+    frag_color.a = max(col.a, mix(lum, warmth, warmthAmount) * maxExtractAlpha);
+
 }
diff --git a/indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl b/indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl
index ccda75596d..209c3081fb 100644
--- a/indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl
+++ b/indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file glowExtractV.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$
  */
@@ -29,9 +29,9 @@ in vec3 position;
 
 out vec2 vary_texcoord0;
 
-void main() 
+void main()
 {
-	gl_Position = vec4(position, 1.0);
-	
-	vary_texcoord0.xy = position.xy * 0.5 + 0.5;
+    gl_Position = vec4(position, 1.0);
+
+    vary_texcoord0.xy = position.xy * 0.5 + 0.5;
 }
diff --git a/indra/newview/app_settings/shaders/class1/effects/glowF.glsl b/indra/newview/app_settings/shaders/class1/effects/glowF.glsl
index 8718dd8b52..ce17dcf810 100644
--- a/indra/newview/app_settings/shaders/class1/effects/glowF.glsl
+++ b/indra/newview/app_settings/shaders/class1/effects/glowF.glsl
@@ -1,28 +1,28 @@
-/** 
+/**
  * @file glowF.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$
  */
- 
+
 out vec4 frag_color;
 
 uniform sampler2D diffuseMap;
@@ -36,21 +36,21 @@ in vec4 vary_texcoord3;
 void main()
 {
 
-	vec4 col = vec4(0.0, 0.0, 0.0, 0.0);
-
-	// ATI compiler falls down on array initialization.
-	float kern[8];
-		kern[0] = 0.25; kern[1] = 0.5; kern[2] = 0.8; kern[3] = 1.0;
-		kern[4] = 1.0;  kern[5] = 0.8; kern[6] = 0.5; kern[7] = 0.25;
-	
-	col += kern[0] * texture(diffuseMap, vary_texcoord0.xy);	
-	col += kern[1] * texture(diffuseMap, vary_texcoord1.xy);
-	col += kern[2] * texture(diffuseMap, vary_texcoord2.xy);	
-	col += kern[3] * texture(diffuseMap, vary_texcoord3.xy);	
-	col += kern[4] * texture(diffuseMap, vary_texcoord0.zw);	
-	col += kern[5] * texture(diffuseMap, vary_texcoord1.zw);	
-	col += kern[6] * texture(diffuseMap, vary_texcoord2.zw);	
-	col += kern[7] * texture(diffuseMap, vary_texcoord3.zw);	
-	
-	frag_color = max(vec4(col.rgb * glowStrength, col.a), vec4(0));
+    vec4 col = vec4(0.0, 0.0, 0.0, 0.0);
+
+    // ATI compiler falls down on array initialization.
+    float kern[8];
+        kern[0] = 0.25; kern[1] = 0.5; kern[2] = 0.8; kern[3] = 1.0;
+        kern[4] = 1.0;  kern[5] = 0.8; kern[6] = 0.5; kern[7] = 0.25;
+
+    col += kern[0] * texture(diffuseMap, vary_texcoord0.xy);
+    col += kern[1] * texture(diffuseMap, vary_texcoord1.xy);
+    col += kern[2] * texture(diffuseMap, vary_texcoord2.xy);
+    col += kern[3] * texture(diffuseMap, vary_texcoord3.xy);
+    col += kern[4] * texture(diffuseMap, vary_texcoord0.zw);
+    col += kern[5] * texture(diffuseMap, vary_texcoord1.zw);
+    col += kern[6] * texture(diffuseMap, vary_texcoord2.zw);
+    col += kern[7] * texture(diffuseMap, vary_texcoord3.zw);
+
+    frag_color = max(vec4(col.rgb * glowStrength, col.a), vec4(0));
 }
diff --git a/indra/newview/app_settings/shaders/class1/effects/glowV.glsl b/indra/newview/app_settings/shaders/class1/effects/glowV.glsl
index 60ec4e6f3b..a824c69f0c 100644
--- a/indra/newview/app_settings/shaders/class1/effects/glowV.glsl
+++ b/indra/newview/app_settings/shaders/class1/effects/glowV.glsl
@@ -1,28 +1,28 @@
-/** 
+/**
  * @file glowV.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$
  */
- 
+
 uniform mat4 modelview_projection_matrix;
 
 in vec3 position;
@@ -34,19 +34,19 @@ out vec4 vary_texcoord1;
 out vec4 vary_texcoord2;
 out vec4 vary_texcoord3;
 
-void main() 
+void main()
 {
-	gl_Position = vec4(position, 1.0);
-	
-	vec2 texcoord = position.xy * 0.5 + 0.5;
-
-
-	vary_texcoord0.xy = texcoord + glowDelta*(-3.5);
-	vary_texcoord1.xy = texcoord + glowDelta*(-2.5);
-	vary_texcoord2.xy = texcoord + glowDelta*(-1.5);
-	vary_texcoord3.xy = texcoord + glowDelta*(-0.5);
-	vary_texcoord0.zw = texcoord + glowDelta*(0.5);
-	vary_texcoord1.zw = texcoord + glowDelta*(1.5);
-	vary_texcoord2.zw = texcoord + glowDelta*(2.5);
-	vary_texcoord3.zw = texcoord + glowDelta*(3.5);
+    gl_Position = vec4(position, 1.0);
+
+    vec2 texcoord = position.xy * 0.5 + 0.5;
+
+
+    vary_texcoord0.xy = texcoord + glowDelta*(-3.5);
+    vary_texcoord1.xy = texcoord + glowDelta*(-2.5);
+    vary_texcoord2.xy = texcoord + glowDelta*(-1.5);
+    vary_texcoord3.xy = texcoord + glowDelta*(-0.5);
+    vary_texcoord0.zw = texcoord + glowDelta*(0.5);
+    vary_texcoord1.zw = texcoord + glowDelta*(1.5);
+    vary_texcoord2.zw = texcoord + glowDelta*(2.5);
+    vary_texcoord3.zw = texcoord + glowDelta*(3.5);
 }