From e2ec9459cb8df1662304e009944dafb9f558b1b7 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Wed, 2 Dec 2009 16:53:00 +0200 Subject: fixed EXT-2938 (Log of not active IM floater isn't refreshed when IM session is in multitab mode) by employing setVisible for updating messaged --HG-- branch : product-engine --- indra/newview/llimfloater.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 3315d5b18d..9b7df38c5e 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -352,9 +352,6 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id) LLIMFloater* floater = LLFloaterReg::showTypedInstance("impanel", session_id); - floater->updateMessages(); - floater->mInputEditor->setFocus(TRUE); - if(isChatMultiTab()) { // do not add existed floaters to avoid adding torn off instances @@ -434,6 +431,13 @@ void LLIMFloater::setVisible(BOOL visible) { channel->updateShowToastsState(); } + + if (visible && mChatHistory && mInputEditor) + { + //only if floater was construced and initialized from xml + updateMessages(); + mInputEditor->setFocus(TRUE); + } } //static -- cgit v1.2.3