summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimcontainer.cpp
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2013-04-26 06:39:08 +0300
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2013-04-26 06:39:08 +0300
commitd2c9543a19fa4ed008bbda841885bd1f34c289a0 (patch)
treebba9d3230efcf1796261df5c8b4ef3c24191235f /indra/newview/llfloaterimcontainer.cpp
parent724cab416f15cbbe60116fbd956032c088010ce7 (diff)
CHUI-859 FIXED Conversation panel moves when new message received with Open Conversation window preference
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
-rw-r--r--indra/newview/llfloaterimcontainer.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 7519942901..a3a0093346 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -804,13 +804,6 @@ void LLFloaterIMContainer::reshapeFloaterAndSetResizeLimits(bool collapse, S32 d
setCanMinimize(at_least_one_panel_is_expanded);
assignResizeLimits();
-
- // force set correct size for the title after show/hide minimize button
- LLRect cur_rect = getRect();
- LLRect force_rect = cur_rect;
- force_rect.mRight = cur_rect.mRight + 1;
- setRect(force_rect);
- setRect(cur_rect);
}
void LLFloaterIMContainer::assignResizeLimits()
@@ -2105,4 +2098,10 @@ void LLFloaterIMContainer::closeFloater(bool app_quitting/* = false*/)
}
}
+void LLFloaterIMContainer::handleReshape(const LLRect& rect, bool by_user)
+{
+ LLMultiFloater::handleReshape(rect, by_user);
+ storeRectControl();
+}
+
// EOF