Merged in SL-12574_srgb_linear_fix (pull request #26)

SL-12574 Fix EEP cubemap not matching non-EEP for both ALM on and off

Approved-by: Dave Houlton <euclid@lindenlab.com>

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

@@ -56,7 +56,7 @@ void main()
 	color.rgb *= vertex_color.rgb;
 	
 	vec3 envColor = textureCube(environmentMap, vary_texcoord1.xyz).rgb;	
-	color.rgb = mix(color.rgb, envColor.rgb, vertex_color.a);
+	color.rgb = mix(color.rgb, envColor.rgb, vertex_color.a*0.75); // MAGIC NUMBER SL-12574; ALM: Off, Quality > Low
 
 	color.rgb = pow(color.rgb,vec3(2.2f,2.2f,2.2f));
 	

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

@@ -162,7 +162,7 @@ vec3 post_diffuse = color.rgb;
             vec3 env_vec = env_mat * refnormpersp;
             vec3 reflected_color = textureCube(environmentMap, env_vec).rgb;
 #if !defined(SUNLIGHT_KILL)
-            color = mix(color.rgb, reflected_color, envIntensity); 
+            color = mix(color.rgb, reflected_color, envIntensity*0.75); // MAGIC NUMBER SL-12574; ALM: On, Quality <= Mid+
 #endif
         }
         

indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl

@@ -44,7 +44,7 @@ void fullbright_shiny_lighting()
 	color.rgb *= vertex_color.rgb;
 	
 	vec3 envColor = textureCube(environmentMap, vary_texcoord1.xyz).rgb;	
-	color.rgb = mix(color.rgb, envColor.rgb, vertex_color.a);
+	color.rgb = mix(color.rgb, envColor.rgb, vertex_color.a*0.75); // MAGIC NUMBER SL-12574; ALM: Off, Quality > Low
 
 	color.rgb = fullbrightShinyAtmosTransport(color.rgb);
 

indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl

@@ -45,7 +45,7 @@ void shiny_lighting()
 	color.rgb *= vertex_color.rgb;
 	
 	vec3 envColor = textureCube(environmentMap, vary_texcoord1.xyz).rgb;	
-	color.rgb = mix(color.rgb, envColor.rgb, vertex_color.a);
+	color.rgb = mix(color.rgb, envColor.rgb, vertex_color.a*0.75); // MAGIC NUMBER SL-12574; ALM: Off, Quality > Low
 
 	color.rgb = atmosLighting(color.rgb);
 

indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl

@@ -169,7 +169,7 @@ vec3 post_diffuse = color.rgb;
             vec3 env_vec = env_mat * refnormpersp;
             vec3 reflected_color = textureCube(environmentMap, env_vec).rgb;
 #if !defined(SUNLIGHT_KILL)
-            color = mix(color.rgb, reflected_color, envIntensity); 
+            color = mix(color.rgb, reflected_color, envIntensity*0.75); // MAGIC NUMBER SL-12574; ALM: On, Quality >= High
 #endif
         }