diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-07-25 16:16:06 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-07-25 16:16:06 +0300 |
| commit | de8cd534b985450f6d9ff9d2ad947a2a110f76a8 (patch) | |
| tree | 0e2ce79b85fb1b070c6665327e857aff90947871 /indra | |
| parent | e2e0003dea5994ee36f18bba683fde4e7775db66 (diff) | |
CHUI-230 [FIXED] Torn off conversation window size resizes when viewer window is resized
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index a21690bed8..4e53082c05 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 560e1be213..95f6708e96 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" |