From b64fc84707a0ab4c11e84cf5caec32bbc267f313 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 18 Jun 2012 08:21:42 -0700
Subject: [PATCH] CHUI-145 : WIP Always open the message pane when clicking on
a conversation in the list
---
indra/llui/llmultifloater.cpp | 2 +-
indra/newview/llimfloatercontainer.cpp | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp
index 540ac74aee7..6f0e691f109 100644
--- a/indra/llui/llmultifloater.cpp
+++ b/indra/llui/llmultifloater.cpp
@@ -173,7 +173,7 @@ void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater,
else if (floaterp->getHost())
{
// floaterp is hosted by somebody else and
- // this is adding it, so remove it from it's old host
+ // this is adding it, so remove it from its old host
floaterp->getHost()->removeFloater(floaterp);
}
else if (floaterp->getParent() == gFloaterView)
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index af5d587f205..e8eae331a1b 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -431,6 +431,8 @@ LLConversationItem::LLConversationItem(std::string name, const LLUUID& uuid, LLF
// Virtual action callbacks
void LLConversationItem::selectItem(void)
{
+ // Always expand the message pane in that case
+ mContainer->collapseMessagesPane(false);
// Switch to the conversation floater that is being selected
mContainer->selectFloater(mFloater);
}
--
GitLab