summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimcontainer.cpp
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@lindenlab.com>2025-12-03 11:50:32 -0500
committerGitHub <noreply@github.com>2025-12-03 11:50:32 -0500
commitbf347d15804c27348c84a55ab763f89b718e8aac (patch)
treea112d8ef3e65581fb1fae03a093a75637d134756 /indra/newview/llfloaterimcontainer.cpp
parentaec7bf19ebffd9d6b60c68e31de723eabd6aa98a (diff)
parentad6008a5880dff8691f5fce56b7fbfc5ea8b1626 (diff)
Merge pull request #4853 from secondlife/release/2025.08
Release/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);
+ }
}
}