From 74254c9524e66d13a061312a629cc404a6c64a54 Mon Sep 17 00:00:00 2001
From: "Jonathan \"Geenz\" Goodman" <geenz@lindenlab.com>
Date: Wed, 26 Mar 2025 10:28:01 -0400
Subject: Disable shoreline fade. (#3811)

---
 indra/newview/app_settings/shaders/class3/environment/waterF.glsl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/shaders/class3/environment/waterF.glsl b/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
index e57aa69731..349f3b9a67 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;
 
@@ -267,9 +266,9 @@ void main()
 #ifdef SHORELINE_FADE
     fade = max(0,min(1, (pos.z - refPos.z) / 10));
 #else
-    fade = 1 * water_mask;
+    fade = 1;
 #endif
-
+    fade *= water_mask;
     distort2 = mix(distort, distort2, min(1, fade * 10));
     depth = texture(depthMap, distort2).r;
 
-- 
cgit v1.2.3


From b976d261edaeb8fa96f3726ab6530b7866755c67 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 26 Mar 2025 20:01:30 +0200
Subject: #3803 Crash at LLTabContainer::setTab

---
 indra/newview/llfloaterimcontainer.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index e55bf50724..e4b14d8df6 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1939,7 +1939,7 @@ bool LLFloaterIMContainer::removeConversationListItem(const LLUUID& uuid, bool c
     mConversationEventQueue.erase(uuid);
 
     // Don't let the focus fall IW, select and refocus on the first conversation in the list
-    if (change_focus)
+    if (change_focus && isInVisibleChain())
     {
         setFocus(true);
         if (new_selection)
@@ -1959,6 +1959,10 @@ bool LLFloaterIMContainer::removeConversationListItem(const LLUUID& uuid, bool c
             }
         }
     }
+    else
+    {
+        LL_INFOS() << "Conversation widgets: " << (S32)mConversationsWidgets.size() << LL_ENDL;
+    }
     return is_widget_selected;
 }
 
-- 
cgit v1.2.3