diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-11-12 14:06:38 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-11-12 14:06:38 -0500 |
| commit | d191585a3eec778e36e5f0c4b620c3d525c86c42 (patch) | |
| tree | 2612c0d1947e00d9ceba82b054a7a90113ffa752 /indra/llui/llscrollcontainer.cpp | |
| parent | ac1d3a22f2034a5e3aba757bde72825643fa799c (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
Merge. Refresh from viewer-release after 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; } |