summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Zaporozhan <dzaporozhan@productengine.com>2010-01-25 13:09:50 +0200
committerDmitry Zaporozhan <dzaporozhan@productengine.com>2010-01-25 13:09:50 +0200
commita5bb9a722d18ceb0f569013f0c522429bd037030 (patch)
tree68b95ff20cd2f9584c018c29ea0f09333869fadc
parent366baa7b652bee00bd6f4fa2651f4a43ba8aabe0 (diff)
Fixed low bug EXT-4659 - Unnecessary scroll bar appears in location history list if 10 items are presented.
--HG-- branch : product-engine
-rw-r--r--indra/llui/llscrolllistctrl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 4e84013db0..71bba57584 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -498,7 +498,7 @@ void LLScrollListCtrl::fitContents(S32 max_width, S32 max_height)
{
S32 height = llmin( getRequiredRect().getHeight(), max_height );
if(mPageLines)
- height = llmin( mPageLines * mLineHeight + (mDisplayColumnHeaders ? mHeadingHeight : 0), height );
+ height = llmin( mPageLines * mLineHeight + 2*mBorderThickness + (mDisplayColumnHeaders ? mHeadingHeight : 0), height );
S32 width = getRect().getWidth();