From 17f574529db5d0456d32006ca9002dd417d1ca39 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 8 Oct 2013 19:28:56 +0200 Subject: [PATCH] FIRE-11841: Conversations button in toolbar doesn't properly set focus to selected floater --- indra/newview/fsfloaterimcontainer.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/indra/newview/fsfloaterimcontainer.cpp b/indra/newview/fsfloaterimcontainer.cpp index fce116897e..c3ee67b919 100644 --- a/indra/newview/fsfloaterimcontainer.cpp +++ b/indra/newview/fsfloaterimcontainer.cpp @@ -108,6 +108,12 @@ void FSFloaterIMContainer::onOpen(const LLSD& key) LLMultiFloater::showFloater(floater); } } + + LLFloater* active_floater = getActiveFloater(); + if (active_floater && !active_floater->hasFocus()) + { + active_floater->setFocus(TRUE); + } /* if (key.isDefined())