diff options
| author | James Cook <james@lindenlab.com> | 2009-12-01 11:44:49 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-01 11:44:49 -0800 |
| commit | 0ae508c99b6a6ad6d1c37b9686430103a2ed9b8d (patch) | |
| tree | e1b84783efb23ff8ced559a019e9be20f880488a /indra/llui | |
| parent | 87ed47c9145c22e7b9e26f4bbca5282c128ac746 (diff) | |
Revert partial fix for EXT-2572 (chat history text clipping) that causes EXT-1597
(script editor scrolls upward while typing)
Backed out changeset: e38642e0c21c
Diffstat (limited to 'indra/llui')
| -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 d91b58b4ea..5e17372fe9 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) { |