summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimcontainer.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-10-25 20:04:44 +0800
committerErik Kundiman <erik@megapahit.org>2025-10-26 12:45:19 +0800
commitaa76edd40883e57541dc85b14d098708d6e074ed (patch)
tree969a5df44f31bd2f007e980bf52280b7b5037ed6 /indra/newview/llfloaterimcontainer.cpp
parent7c37297689f9e6e1b6ac77f33243c1274d5d9e82 (diff)
parent4e2a9667bda1a1980993ae453dfe6ff38dd1835a (diff)
Merge tag 'Second_Life_Release#4e2a9667-2025.08' into 2025.08
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
-rw-r--r--indra/newview/llfloaterimcontainer.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 3d88e117ac..143781a225 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1706,6 +1706,11 @@ void LLFloaterIMContainer::showConversation(const LLUUID& session_id)
if (session_floater)
{
session_floater->restoreFloater();
+ if (session_floater->isTornOff() && session_floater->isMinimized())
+ {
+ session_floater->setMinimized(false);
+ session_floater->setFocus(true);
+ }
}
}