From 4d971c43518f02fe202cf437f059250061cd9756 Mon Sep 17 00:00:00 2001
From: maximbproductengine <maximbproductengine@lindenlab.com>
Date: Fri, 4 Jan 2013 16:48:34 +0200
Subject: CHUI-608 (Conversations floater can be resized too small once a
conversation is torn off)
---
indra/newview/llfloaterimcontainer.cpp | 6 ++++++
indra/newview/llfloaterimcontainer.h | 1 +
indra/newview/llfloaterimsessiontab.cpp | 5 -----
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 2019a35faa..151d901708 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -605,6 +605,12 @@ void LLFloaterIMContainer::setVisible(BOOL visible)
LLMultiFloater::setVisible(visible);
}
+void LLFloaterIMContainer::updateResizeLimits()
+{
+ LLMultiFloater::updateResizeLimits();
+ assignResizeLimits();
+}
+
void LLFloaterIMContainer::collapseMessagesPane(bool collapse)
{
if (mMessagesPane->isCollapsed() == collapse)
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h
index 8daed46c7d..0cd1b6759b 100644
--- a/indra/newview/llfloaterimcontainer.h
+++ b/indra/newview/llfloaterimcontainer.h
@@ -60,6 +60,7 @@ public:
/*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void draw();
/*virtual*/ void setVisible(BOOL visible);
+ /*virtual*/ void updateResizeLimits();
void onCloseFloater(LLUUID& id);
/*virtual*/ void addFloater(LLFloater* floaterp,
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 4e79bd0ac8..f5b657fa60 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -751,11 +751,6 @@ void LLFloaterIMSessionTab::onTearOffClicked()
{
forceReshape();
}
- LLFloaterIMContainer* container = LLFloaterIMContainer::getInstance();
- if (container)
- {
- container->assignResizeLimits();
- }
refreshConversation();
updateGearBtn();
}
--
cgit v1.2.3