diff options
| author | James Cook <james@lindenlab.com> | 2009-12-01 11:45:11 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-01 11:45:11 -0800 |
| commit | 594f96b92ee86570d1973510a44a494dc520b523 (patch) | |
| tree | 0543a677ea382b0220447043f6ed807683ffeed1 /indra | |
| parent | d5d1db8833473e9524340071f551d019a13fea21 (diff) | |
| parent | 0ae508c99b6a6ad6d1c37b9686430103a2ed9b8d (diff) | |
Merge - backing out scroll container change
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llscrollcontainer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index 8a33619b58..53c5a8d07d 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -111,8 +111,7 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p) LLView::addChild( mBorder ); mInnerRect.set( 0, getRect().getHeight(), getRect().getWidth(), 0 ); - if ( mBorder->getVisible() ) - mInnerRect.stretch( -mBorder->getBorderWidth() ); + mInnerRect.stretch( -mBorder->getBorderWidth() ); LLRect vertical_scroll_rect = mInnerRect; vertical_scroll_rect.mLeft = vertical_scroll_rect.mRight - scrollbar_size; @@ -190,8 +189,7 @@ void LLScrollContainer::reshape(S32 width, S32 height, LLUICtrl::reshape( width, height, called_from_parent ); mInnerRect = getLocalRect(); - if ( mBorder->getVisible() ) - mInnerRect.stretch( -mBorder->getBorderWidth() ); + mInnerRect.stretch( -mBorder->getBorderWidth() ); if (mScrolledView) { |