diff options
| author | Callum Prentice <callum@lindenlab.com> | 2025-10-22 19:16:59 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2025-10-22 19:16:59 -0700 |
| commit | 21e9b38f06e187414d30c12c8c69ebf7b4e4e636 (patch) | |
| tree | d41d6b2db8a878cc18f2215e01fd710fb663a76e /indra/newview/llfloaterimcontainer.cpp | |
| parent | c64c16a59ae2220b29ba0ed1f3f22da07e694612 (diff) | |
| parent | 0da96a508a5d8d384e017f707babd2193f6ca6a7 (diff) | |
Merge branch 'develop' of https://github.com/secondlife/viewer into callum/voice-moderation-2
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 2b9fb9dd37..c25fbdcc51 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -1721,6 +1721,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); + } } } |