diff options
| author | Baker Linden <baker@lindenlab.com> | 2013-12-18 18:25:47 -0500 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2013-12-18 18:25:47 -0500 |
| commit | 3c521d8207092f1c48e158082b88c5e81cc9c440 (patch) | |
| tree | 36a18cfaed8fc4e3ee2a84604f3876832522e529 /indra/llui/llscrollcontainer.cpp | |
| parent | 74707f0057c05dc4dd439302e64fe29e8ed91a32 (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
viewer-release merge
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; } |