diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-26 12:24:11 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-26 12:24:11 +0200 |
| commit | a243a0475e9bc87ec4acf31700443461ebc58a54 (patch) | |
| tree | deb0e5b312e2dc9bf60dc1da600fc9ea4c0774b1 /indra/newview | |
| parent | 890965faf5baa5f6f832e086991d59bb8d33b7bc (diff) | |
CHUI-542 (Torn off message in conversation panel is not cleared when torn off conversation is closed)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 304fb78260..d4b552deae 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -1353,10 +1353,12 @@ bool LLFloaterIMContainer::removeConversationListItem(const LLUUID& uuid, bool c setFocus(TRUE); if(new_selection != NULL) { + if (mConversationsWidgets.size() == 1) + new_selection = new_selection->getParentFolder(); LLConversationItem* vmi = dynamic_cast<LLConversationItem*>(new_selection->getViewModelItem()); if(vmi != NULL) { - selectConversation(vmi->getUUID()); + selectConversationPair(vmi->getUUID(), true); } } } |