summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r--indra/newview/llimfloater.cpp10
1 files 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<LLIMFloater>("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