From ce7db31b7f113967d1fb8033bb41261700fca109 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Mon, 4 Mar 2013 18:46:37 +0200
Subject: [PATCH] CHUI-822 FIXED Resizing conversation floater with
 conversation list minimized to icons sets to fixed width that cannot be
 reduced : set resize limits to conv.panel's minDim() when conv. panel is
 collapsed

---
 indra/newview/llfloaterimcontainer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 8d630b9d50d..413707baae3 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -759,7 +759,7 @@ void LLFloaterIMContainer::assignResizeLimits()
     S32 number_of_visible_borders = llmin((is_conv_pane_expanded? 2 : 0) + (is_msg_pane_expanded? 2 : 0), 3);
     S32 summary_width_of_visible_borders = number_of_visible_borders * LLPANEL_BORDER_WIDTH;
 	S32 conv_pane_current_width = is_msg_pane_expanded
-			? mConversationsPane->getRect().getWidth()
+			? (is_conv_pane_expanded? mConversationsPane->getRect().getWidth() : mConversationsPane->getMinDim())
 			: (is_conv_pane_expanded? mConversationsPane->getExpandedMinDim() : mConversationsPane->getMinDim());
 	S32 msg_pane_min_width  = is_msg_pane_expanded ? mMessagesPane->getExpandedMinDim() : 0;
 	S32 new_min_width = conv_pane_current_width + msg_pane_min_width + summary_width_of_visible_borders;
-- 
GitLab