Merged in graham_linden/viewer-eep-fixes (pull request #347)

SL-10925, SL-10926, SL-10896

1 files changed, 4 insertions, 0 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl b/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl
index 7732cf986e..aae6158673 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl
@@ -44,6 +44,8 @@ uniform sampler2D altDiffuseMap;
 uniform float blend_factor; // interp factor between moon A/B
 VARYING vec2 vary_texcoord0;
 
+vec3 srgb_to_linear(vec3 c);
+
 void main() 
 {
     vec4 moonA = texture2D(diffuseMap, vary_texcoord0.xy);
@@ -58,6 +60,8 @@ void main()
 
     vec3 exp = vec3(1.0 - mix * moon_brightness) * 2.0  - 1.0;
     c.rgb = pow(c.rgb, exp);
+    c.rgb = srgb_to_linear(c.rgb);
+
     //c.rgb *= moonlight_color.rgb;
 
     frag_data[0] = vec4(c.rgb, c.a);