2 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index abf15ea9cf..e55bf50724 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -306,6 +306,9 @@ bool LLFloaterIMContainer::postBuild()
     mParticipantRefreshTimer.setTimerExpirySec(0);
     mParticipantRefreshTimer.start();
 
+    mGeneralTitleInUse = true; // avoid reseting strings on idle
+    setTitle(mGeneralTitle);
+
     return true;
 }
 
@@ -521,7 +524,12 @@ void LLFloaterIMContainer::idleUpdate()
 
             // Update floater's title as required by the currently selected session or use the default title
             LLFloaterIMSession * conversation_floaterp = LLFloaterIMSession::findInstance(current_session->getUUID());
-            setTitle(conversation_floaterp && conversation_floaterp->needsTitleOverwrite() ? conversation_floaterp->getTitle() : mGeneralTitle);
+            bool needs_override = conversation_floaterp && conversation_floaterp->needsTitleOverwrite();
+            if (mGeneralTitleInUse == needs_override)
+            {
+                mGeneralTitleInUse = !needs_override;
+                setTitle(needs_override ? conversation_floaterp->getTitle() : mGeneralTitle);
+            }
         }
 
         mParticipantRefreshTimer.setTimerExpirySec(1.0f);
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h
index d1cfd3442c..e5486e67da 100644
--- a/indra/newview/llfloaterimcontainer.h
+++ b/indra/newview/llfloaterimcontainer.h
@@ -234,6 +234,7 @@ private:
     conversations_items_deque mConversationEventQueue;
 
     LLTimer mParticipantRefreshTimer;
+    bool mGeneralTitleInUse = true;
 };
 
 #endif // LL_LLFLOATERIMCONTAINER_H