From 3ee18d8b29caa612ee7656aa1ac69e3c1edce4cc Mon Sep 17 00:00:00 2001
From: mberezhnoy <mberezhnoy@productengine.com>
Date: Thu, 14 Mar 2013 11:28:56 +0200
Subject: [PATCH] CHUI-844 (Collapsed conversation panel auto expands when a
new IM conversation starts) CHUI-713 ("Conversations" floater size doesn't
persist between sessions)
---
indra/newview/llfloaterimcontainer.cpp | 12 +-----------
indra/newview/llfloaterimcontainer.h | 1 -
indra/newview/llimview.cpp | 1 +
3 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 7437dd8cda7..5f1b3dcfb11 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -62,8 +62,7 @@ LLFloaterIMContainer::LLFloaterIMContainer(const LLSD& seed, const Params& param
mExpandCollapseBtn(NULL),
mConversationsRoot(NULL),
mConversationsEventStream("ConversationsEvents"),
- mInitialized(false),
- mIsFirstLaunch(false)
+ mInitialized(false)
{
mEnableCallbackRegistrar.add("IMFloaterContainer.Check", boost::bind(&LLFloaterIMContainer::isActionChecked, this, _2));
mCommitCallbackRegistrar.add("IMFloaterContainer.Action", boost::bind(&LLFloaterIMContainer::onCustomAction, this, _2));
@@ -245,7 +244,6 @@ BOOL LLFloaterIMContainer::postBuild()
mGeneralTitle = getTitle();
mInitialized = true;
- mIsFirstLaunch = true;
// Add callbacks:
// We'll take care of view updates on idle
@@ -280,12 +278,6 @@ void LLFloaterIMContainer::addFloater(LLFloater* floaterp,
LLUUID session_id = floaterp->getKey();
- // Make sure the message panel is open when adding a floater or it stays mysteriously hidden
- if (!mIsFirstLaunch)
- {
- collapseMessagesPane(false);
- }
-
// Add the floater
LLMultiFloater::addFloater(floaterp, select_added_floater, insertion_point);
@@ -646,8 +638,6 @@ void LLFloaterIMContainer::collapseMessagesPane(bool collapse)
return;
}
- mIsFirstLaunch = false;
-
// Save current width of panels before collapsing/expanding right pane.
S32 conv_pane_width = mConversationsPane->getRect().getWidth();
S32 msg_pane_width = mMessagesPane->getRect().getWidth();
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h
index 5139651d8d0..2cbc1e99f9a 100644
--- a/indra/newview/llfloaterimcontainer.h
+++ b/indra/newview/llfloaterimcontainer.h
@@ -174,7 +174,6 @@ class LLFloaterIMContainer
LLLayoutStack* mConversationsStack;
bool mInitialized;
- bool mIsFirstLaunch;
LLUUID mSelectedSession;
std::string mGeneralTitle;
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 8f3f5145a96..699e36db4f7 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -285,6 +285,7 @@ void on_new_message(const LLSD& msg)
{
//Surface conversations floater
LLFloaterReg::showInstance("im_container");
+ im_box->collapseMessagesPane(false);
}
//If in DND mode, allow notification to be stored so upon DND exit
--
GitLab