Merge tag 'Second_Life_Release#4e80ec7e-2025.03' into 2025.03

1 files changed, 2 insertions, 3 deletions

diff --git a/indra/newview/app_settings/shaders/class3/environment/waterF.glsl b/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
index 366335b4f6..b9de4edc67 100644
--- a/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
@@ -26,7 +26,6 @@
 // class3/environment/waterF.glsl
 
 #define WATER_MINIMAL 1
-#define SHORELINE_FADE 1
 
 out vec4 frag_color;
 
@@ -269,9 +268,9 @@ void main()
 #ifdef SHORELINE_FADE
     fade = max(0.0,min(1.0, (pos.z - refPos.z) / 10.0));
 #else
-    fade = 1.0 * water_mask;
+    fade = 1.0;
 #endif
-
+    fade *= water_mask;
     distort2 = mix(distort, distort2, min(1.0, fade * 10.0));
     depth = texture(depthMap, distort2).r;