summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorMaximB ProductEngine <mberezhnoy@productengine.com>2013-08-26 20:09:58 +0300
committerMaximB ProductEngine <mberezhnoy@productengine.com>2013-08-26 20:09:58 +0300
commitac2dc34ed0abbac8d5a8eb7f887037fe387c6a7a (patch)
tree2b01fa648fb16e3fa2adae47d39cebfc08e839d5 /indra/llui
parentf2b5bfc60509c3ee69d9376b7abf0e5b347e474d (diff)
MAINT-3041 (crash in LLScrollContainer::updateScroll() on Windows)
Diffstat (limited to 'indra/llui')
-rwxr-xr-xindra/llui/llscrollcontainer.cpp2
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;
}