Merged in SL-14731 (pull request #455)

SL-14731: Fix sun gamma -- merge Sovereign Engineer's patch: Fix sun gamma space for accurate color reproduction of sun textures

Approved-by: Dave Houlton

doc/contributions.txt

@@ -1356,6 +1356,7 @@ Sovereign Engineer
 	SL-11625
 	SL-14705
 	SL-14707
+	SL-14731
 SpacedOut Frye
 	VWR-34
 	VWR-45

indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl

@@ -49,10 +49,6 @@ void main()
     vec4 sunDiscB = texture2D(altDiffuseMap, vary_texcoord0.xy);
     vec4 c     = mix(sunDiscA, sunDiscB, blend_factor);
 
-    c.rgb = srgb_to_linear(c.rgb);
-    c.rgb = clamp(c.rgb, vec3(0), vec3(1));
-    c.rgb = pow(c.rgb, vec3(0.7f));
-
     //c.rgb = fullbrightAtmosTransport(c.rgb);
     c.rgb = fullbrightScaleSoftClip(c.rgb);
 

indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl

@@ -51,7 +51,6 @@ void main()
 // SL-9806 stars poke through
 //    c.a *= sun_fade;
 
-    c.rgb = pow(c.rgb, vec3(0.7f));
     c.rgb = fullbrightAtmosTransport(c.rgb);
     c.rgb = fullbrightScaleSoftClip(c.rgb);
     frag_color = c;