diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:59:50 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:59:50 -0800 |
| commit | 4745ab85dab9e418c49e5c4a722aa88548b8f39e (patch) | |
| tree | 367001447fda9438c5beb03f2fb09bbe7e2b2abd /indra/llui/llscrollcontainer.cpp | |
| parent | 6a89cb6f25adafdf07a4241e7bbe6fee758c1048 (diff) | |
| parent | a4f121f065c580ac34e8caa666855c95eb29138b (diff) | |
Pull merge from lindenlab/viewer-acme
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; } |