diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:45:07 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:45:07 -0700 |
| commit | 037cbf82310710a1ec8f0affd2bba24aa87d20b5 (patch) | |
| tree | 51eb135eaaff94a8ed119486d05e963c2cd8a676 /indra/llui/llscrollcontainer.cpp | |
| parent | 0103cac1ddda96fd470238d2c8b73c2cf55b6c12 (diff) | |
| parent | e285d515d5b94acce280edf586a16272931749d9 (diff) | |
Merge lion for good measure
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; } |