Merge

2 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl
index 5bb2020971..1fb337498c 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl
@@ -52,7 +52,8 @@ void main()
     c.rgb = fullbrightAtmosTransport(c.rgb);
     c.rgb = fullbrightScaleSoftClip(c.rgb);
 
-    c.a *= sun_fade;
+    // SL-9806 stars poke through
+    //c.a *= sun_fade;
 
     frag_data[0] = c;
     frag_data[1] = vec4(0.0f);
diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
index 668379164d..d85ce004a5 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
@@ -47,7 +47,9 @@ void main()
     vec4 sunA = texture2D(diffuseMap, vary_texcoord0.xy);
     vec4 sunB = texture2D(altDiffuseMap, vary_texcoord0.xy);
     vec4 c     = mix(sunA, sunB, blend_factor);
-    c.a *= sun_fade;
+
+// SL-9806 stars poke through
+//    c.a *= sun_fade;
 
     c.rgb = pow(c.rgb, vec3(0.7f));
     c.rgb = fullbrightAtmosTransport(c.rgb);