diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-08 18:38:29 -0800 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-08 18:38:29 -0800 |
commit | 4621be8194ad87317bef7315ee17a8b8f4487e17 (patch) | |
tree | 72f23852260c11f13b2880e025b761df7eea3b5d /indra/newview/llfloaterimcontainer.cpp | |
parent | 24e650b4039d3b3515109fa9e271abfa2a2ebd6a (diff) | |
parent | a1fb4a1c999e9b0fded574dfce62a0861f02436e (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
-rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index d67f2be658..cdffdcf806 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -1885,6 +1885,9 @@ bool LLFloaterIMContainer::isScrolledOutOfSight(LLConversationViewSession* conve { llassert(conversation_item_widget != NULL); + // make sure the widget is actually in the right spot first + mConversationsRoot->arrange(NULL, NULL); + // check whether the widget is in the visible portion of the scroll container LLRect widget_rect; conversation_item_widget->localRectToOtherView(conversation_item_widget->getLocalRect(), &widget_rect, mConversationsRoot); |