diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-03-22 18:58:20 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-03-22 18:58:20 +0200 |
| commit | c8f83f48955911c858fbaba44c6972e546aa8ce7 (patch) | |
| tree | dc4c2af262e110ecda7e4cc24b826db76b99cfc7 | |
| parent | b2d122975a68a53887c321c8fbca9eeb78add003 (diff) | |
CHUI-854 FIXED Don't expand chat in collapsed mode.
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 5e0cd8ef78..bf7fe6db36 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -1963,10 +1963,13 @@ bool LLFloaterIMContainer::selectNextorPreviousConversation(bool select_next, bo void LLFloaterIMContainer::expandConversation() { - LLConversationViewSession* widget = dynamic_cast<LLConversationViewSession*>(get_ptr_in_map(mConversationsWidgets,getSelectedSession())); - if (widget) + if(!mConversationsPane->isCollapsed()) { - widget->setOpen(!widget->isOpen()); + LLConversationViewSession* widget = dynamic_cast<LLConversationViewSession*>(get_ptr_in_map(mConversationsWidgets,getSelectedSession())); + if (widget) + { + widget->setOpen(!widget->isOpen()); + } } } |