diff options
| author | James Cook <james@lindenlab.com> | 2009-11-28 21:02:55 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-28 21:02:55 -0800 |
| commit | e8b436591ad198a5aa37d51077e2d5b0d5b62562 (patch) | |
| tree | 196a32ac8cc9b67809201e0d762eee4b47a8cb9e /indra/llui/llscrollcontainer.cpp | |
| parent | 0e34bc413aa562acf97b77333fb9a1f0ec9b55f0 (diff) | |
| parent | 9d52d15db8b61ff3172fadb1b82cd39f892251c5 (diff) | |
merge
Diffstat (limited to 'indra/llui/llscrollcontainer.cpp')
| -rw-r--r-- | indra/llui/llscrollcontainer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index 5e17372fe9..53c5a8d07d 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -584,8 +584,9 @@ LLRect LLScrollContainer::getVisibleContentRect() return visible_rect; } -LLRect LLScrollContainer::getContentWindowRect() const +LLRect LLScrollContainer::getContentWindowRect() { + updateScroll(); LLRect scroller_view_rect; S32 visible_width = 0; S32 visible_height = 0; @@ -625,7 +626,7 @@ void LLScrollContainer::scrollToShowRect(const LLRect& rect, const LLRect& const rect_to_constrain.mTop - constraint.mTop); // translate from allowable region for lower left corner to upper left corner - allowable_scroll_rect.translate(0, content_window_rect.getHeight()); + allowable_scroll_rect.translate(0, content_window_rect.getHeight() - 1); S32 vert_pos = llclamp(mScrollbar[VERTICAL]->getDocPos(), mScrollbar[VERTICAL]->getDocSize() - allowable_scroll_rect.mTop, // min vertical scroll |