diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimconversation.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index 3b334df189..9f3c6d0f3d 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -505,7 +505,12 @@ void LLIMConversation::onSlide(LLIMConversation* self) /*virtual*/ void LLIMConversation::onOpen(const LLSD& key) { - checkIfTornOff(); + if (!checkIfTornOff()) + { + LLIMFloaterContainer* host_floater = dynamic_cast<LLIMFloaterContainer*>(getHost()); + // Show the messages pane when opening a floater hosted in the Conversations + host_floater->collapseMessagesPane(false); + } } // virtual @@ -541,13 +546,6 @@ bool LLIMConversation::isChatMultiTab() bool LLIMConversation::checkIfTornOff() { bool isTorn = !getHost(); - if (!isTorn) - { - LLIMFloaterContainer* host_floater = dynamic_cast<LLIMFloaterContainer*>(getHost()); - - // Show the messages pane when opening a floater hosted in the Conversations - host_floater->collapseMessagesPane(false); - } if (isTorn != isTornOff()) { @@ -556,4 +554,4 @@ bool LLIMConversation::checkIfTornOff() } return isTorn; -}
\ No newline at end of file +} |