diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:20:19 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:20:19 +0200 |
| commit | 34b624f873ce931c6089487d5381d76f99494feb (patch) | |
| tree | 7033685c6606a9ea8665773cd76e71eb9aa2d4e9 | |
| parent | abb23ff31260e9632406dae03be920a23220d719 (diff) | |
| parent | e2ec9459cb8df1662304e009944dafb9f558b1b7 (diff) | |
merge
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llimfloater.cpp | 10 |
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 |