diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:40:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:40:22 -0500 |
| commit | d1b4c5bf734b6d30ba0bb5a3bda3a4494100cc6d (patch) | |
| tree | 54a650e8e26dad00b3eaa3340b8bbf3083fc04b6 /indra/llui/llscrollcontainer.cpp | |
| parent | 5ca4a4b8f34342ef510a4241bef4af7cd544d865 (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
merge changes for 3.6.10-release
Diffstat (limited to 'indra/llui/llscrollcontainer.cpp')
| -rwxr-xr-x | indra/llui/llscrollcontainer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index cbcce0ece5..238eae21c2 100755 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -519,7 +519,7 @@ bool LLScrollContainer::addChild(LLView* view, S32 tab_group) void LLScrollContainer::updateScroll() { - if (!mScrolledView) + if (!getVisible() || !mScrolledView) { return; } |