From d73ca40667527a1fdaf29ac3629ec7ce8a7e0f40 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Wed, 6 Mar 2013 17:43:10 -0800
Subject: [PATCH] CHUI-834 (Conversation selection in conversation list does
not update when redocking torn off conversations): Now when click to dock a
torn off floater, the correct conversation line item will be selected.
---
indra/newview/llfloaterimsessiontab.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index de1b3981310..164625fc955 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -798,6 +798,12 @@ void LLFloaterIMSessionTab::onTearOffClicked()
{
forceReshape();
}
+ //Upon re-docking the torn off floater, select the corresponding conversation line item
+ else
+ {
+ LLFloaterIMContainer* container = LLFloaterReg::findTypedInstance<LLFloaterIMContainer>("im_container");
+ container->selectConversation(mSessionID);
+ }
refreshConversation();
updateGearBtn();
}
--
GitLab