Fix for sky being too bright with advanced lighting enabled

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

@@ -321,8 +321,6 @@ void main()
 			col += spec_contrib;
 		}
 	
-		col = mix(col.rgb, diffuse.rgb, diffuse.a);
-
 		if (envIntensity > 0.0)
 		{ //add environmentmap
 			vec3 env_vec = env_mat * refnormpersp;
@@ -332,6 +330,8 @@ void main()
 
 		col = atmosLighting(col);
 		col = scaleSoftClip(col);
+
+		col = mix(col.rgb, diffuse.rgb, diffuse.a);
 	}
 	
 	frag_color.rgb = col;

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

@@ -330,8 +330,6 @@ void main()
 			col += spec_contrib;
 		}
 
-		col = mix(col, diffuse.rgb, diffuse.a);
-
 		if (envIntensity > 0.0)
 		{ //add environmentmap
 			vec3 env_vec = env_mat * refnormpersp;
@@ -341,6 +339,8 @@ void main()
 			
 		col = atmosLighting(col);
 		col = scaleSoftClip(col);
+
+		col = mix(col.rgb, diffuse.rgb, diffuse.a);
 	}