summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimcontainer.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-10-21 21:11:05 +0300
committerGitHub <noreply@github.com>2025-10-21 21:11:05 +0300
commit4e2a9667bda1a1980993ae453dfe6ff38dd1835a (patch)
tree64542828f2ebbf2e1bbe2516073a7dfbe9b5a075 /indra/newview/llfloaterimcontainer.cpp
parent01823996196c11aea905200fe267463d520d285b (diff)
parent0d5138c1f93a77ff52551a76d0d8575413550859 (diff)
Merge from secondlife/develop 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 d821d9a4a5..a0f2dbe197 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1698,6 +1698,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);
+ }
}
}