From a243a0475e9bc87ec4acf31700443461ebc58a54 Mon Sep 17 00:00:00 2001
From: MaximB ProductEngine <mberezhnoy@productengine.com>
Date: Mon, 26 Nov 2012 12:24:11 +0200
Subject: [PATCH] CHUI-542 (Torn off message in conversation panel is not
cleared when torn off conversation is closed)
---
indra/newview/llfloaterimcontainer.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 304fb782609..d4b552deae1 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);
}
}
}
--
GitLab