diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-29 18:25:03 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-29 18:25:03 -0800 |
| commit | a7549d6fe5b36b447f7e6f58387711576f9c2f63 (patch) | |
| tree | 63d81cf896b107cf35b3eecabefc032e021574df /indra/llui/llscrollcontainer.cpp | |
| parent | 5bff5d28ee0cd6b2d17bf1676eecb0ae262f1f48 (diff) | |
| parent | f0426b924f543c62268ac5098c0c2c6a44e68084 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llscrollcontainer.cpp')
| -rw-r--r-- | indra/llui/llscrollcontainer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index 5e17372fe9..d91b58b4ea 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -111,7 +111,8 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p) LLView::addChild( mBorder ); mInnerRect.set( 0, getRect().getHeight(), getRect().getWidth(), 0 ); - mInnerRect.stretch( -mBorder->getBorderWidth() ); + if ( mBorder->getVisible() ) + mInnerRect.stretch( -mBorder->getBorderWidth() ); LLRect vertical_scroll_rect = mInnerRect; vertical_scroll_rect.mLeft = vertical_scroll_rect.mRight - scrollbar_size; @@ -189,7 +190,8 @@ void LLScrollContainer::reshape(S32 width, S32 height, LLUICtrl::reshape( width, height, called_from_parent ); mInnerRect = getLocalRect(); - mInnerRect.stretch( -mBorder->getBorderWidth() ); + if ( mBorder->getVisible() ) + mInnerRect.stretch( -mBorder->getBorderWidth() ); if (mScrolledView) { |