Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into release/2024.08-DeltaFPS

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

@@ -124,6 +124,9 @@ void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, ou
     amblit = tmpAmbient;
 
     additive *= vec3(1.0 - combined_haze);
+
+    // sanity clamp haze contribution
+    additive = min(additive, vec3(10));
 }
 
 vec3 srgb_to_linear(vec3 col);