summaryrefslogtreecommitdiff
path: root/indra/llui/llscrollcontainer.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-10-28 09:32:48 -0700
committerRick Pasetto <rick@lindenlab.com>2009-10-28 09:32:48 -0700
commitc4992e30654775c54e3dc4fb583375ec079b23a4 (patch)
tree31af4a671d5f0b238ffe99a141967bfc977cd69b /indra/llui/llscrollcontainer.cpp
parent88166e7d222bf18fc0324714dc44efef161bc409 (diff)
parentea5a60c80f0243a7e5a6a7fd8357e7c3cd6b5d4d (diff)
Merge from remote repo
Diffstat (limited to 'indra/llui/llscrollcontainer.cpp')
-rw-r--r--indra/llui/llscrollcontainer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index d8606c6889..5e17372fe9 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -432,7 +432,7 @@ void LLScrollContainer::draw()
LLLocalClipRect clip(LLRect(mInnerRect.mLeft,
mInnerRect.mBottom + (show_h_scrollbar ? scrollbar_size : 0) + visible_height,
- visible_width,
+ mInnerRect.mRight - (show_v_scrollbar ? scrollbar_size: 0),
mInnerRect.mBottom + (show_h_scrollbar ? scrollbar_size : 0)
));
drawChild(mScrolledView);