diff options
author | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
commit | 117e22047c5752352342d64e3fb7ce00a4eb8113 (patch) | |
tree | e32de2cfba0dda8705ae528fcd1fbe23ba075685 /linden/indra/llui/llscrollcontainer.cpp | |
parent | Second Life viewer sources 1.18.0.6 (diff) | |
download | meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.zip meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.gz meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.bz2 meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.xz |
Second Life viewer sources 1.18.1.2
Diffstat (limited to 'linden/indra/llui/llscrollcontainer.cpp')
-rw-r--r-- | linden/indra/llui/llscrollcontainer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/llui/llscrollcontainer.cpp b/linden/indra/llui/llscrollcontainer.cpp index be41aa8..b910964 100644 --- a/linden/indra/llui/llscrollcontainer.cpp +++ b/linden/indra/llui/llscrollcontainer.cpp | |||
@@ -505,8 +505,7 @@ void LLScrollableContainerView::draw() | |||
505 | BOOL show_h_scrollbar = FALSE; | 505 | BOOL show_h_scrollbar = FALSE; |
506 | calcVisibleSize( mScrolledView->getRect(), &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar ); | 506 | calcVisibleSize( mScrolledView->getRect(), &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar ); |
507 | 507 | ||
508 | LLGLEnable scissor_test(GL_SCISSOR_TEST); | 508 | LLLocalClipRect clip(LLRect(mInnerRect.mLeft, |
509 | LLUI::setScissorRegionLocal(LLRect(mInnerRect.mLeft, | ||
510 | mInnerRect.mBottom + (show_h_scrollbar ? SCROLLBAR_SIZE : 0) + visible_height, | 509 | mInnerRect.mBottom + (show_h_scrollbar ? SCROLLBAR_SIZE : 0) + visible_height, |
511 | visible_width, | 510 | visible_width, |
512 | mInnerRect.mBottom + (show_h_scrollbar ? SCROLLBAR_SIZE : 0) | 511 | mInnerRect.mBottom + (show_h_scrollbar ? SCROLLBAR_SIZE : 0) |