diff options
author | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-07 10:48:49 +0200 |
---|---|---|
committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-07 10:48:49 +0200 |
commit | b356bbb6a5930e8900250c6654688ae2e6d25ecf (patch) | |
tree | c76eaca21e6c4ee4d338331d668fc2f6980ef810 /indra/newview/llfloaterimsessiontab.cpp | |
parent | 9b0404c4b5c99be3ab3591c7677f95f987056795 (diff) |
CHUI-713 "Conversations" floater size doesn't persist between sessions
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
-rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 6dbcdb4474..526eeef869 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -769,7 +769,10 @@ void LLFloaterIMSessionTab::onOpen(const LLSD& key) { LLFloaterIMContainer* host_floater = dynamic_cast<LLFloaterIMContainer*>(getHost()); // Show the messages pane when opening a floater hosted in the Conversations - host_floater->collapseMessagesPane(false); + if (!isNearbyChat()) + { + host_floater->collapseMessagesPane(false); + } } } |