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

1 files changed, 5 insertions, 1 deletions

diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 920f2b1698..4fed8eebb8 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1947,7 +1947,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)
@@ -1967,6 +1967,10 @@ bool LLFloaterIMContainer::removeConversationListItem(const LLUUID& uuid, bool c
             }
         }
     }
+    else
+    {
+        LL_INFOS() << "Conversation widgets: " << (S32)mConversationsWidgets.size() << LL_ENDL;
+    }
     return is_widget_selected;
 }