diff options
| author | James Cook <james@lindenlab.com> | 2009-12-01 08:51:32 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-01 08:51:32 -0800 |
| commit | 5e11affddb1b8816f57f9314381486c00033e080 (patch) | |
| tree | b21e2486be2daaa9b249588ce7d88f0f9f472814 /indra/llui/llscrollcontainer.cpp | |
| parent | 677938e6531209ca9ccd29146454af67f1c743c7 (diff) | |
| parent | bf34e572e7acd0f80d103318b76b4abe32c802d3 (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 d91b58b4ea..8a33619b58 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -586,8 +586,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; @@ -627,7 +628,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 |