From de8cd534b985450f6d9ff9d2ad947a2a110f76a8 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Wed, 25 Jul 2012 16:16:06 +0300
Subject: [PATCH] CHUI-230 [FIXED] Torn off conversation window size resizes
when viewer window is resized
---
indra/newview/llnearbychat.cpp | 10 ----------
.../skins/default/xui/en/floater_im_session.xml | 2 +-
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index a21690bed85..4e53082c056 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -391,17 +391,7 @@ void LLNearbyChat::onOpen(const LLSD& key)
bool LLNearbyChat::applyRectControl()
{
- bool is_torn_off = getHost() == NULL;
-
- // Resize is limited to torn off floaters.
- // A hosted floater is not resizable.
- if (is_torn_off)
- {
- enableResizeCtrls(true);
- }
-
setResizeLimits(getMinWidth(), EXPANDED_MIN_HEIGHT);
-
return LLFloater::applyRectControl();
}
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 560e1be2136..95f6708e96d 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -9,7 +9,7 @@
can_dock="false"
can_minimize="true"
can_close="true"
- save_rect="false"
+ save_rect="true"
visible="false"
width="394"
can_resize="true"
--
GitLab