summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorAndrey Lihatskiy <andreylproductengine@lindenlab.com>2016-06-08 04:45:51 +0300
committerAndrey Lihatskiy <andreylproductengine@lindenlab.com>2016-06-08 04:45:51 +0300
commit9177aa3bb685d942ef5dc0c4368387d4425a5f2e (patch)
tree1f18199bafebf6f8664bea4d1ace283a01cb9566 /indra/llui
parentaca2dab2d0ff7d66576b5d79f34eb9a706187de4 (diff)
parentf9023371ba6b9bae9eef353ca8b42e4619b8ee01 (diff)
Merged in andreyl_productengine/viewer-lynx-marchcat (pull request #25)
MAINT-6461 Added a null check
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llview.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 8f7cac1f61..62c3f401bf 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -588,6 +588,11 @@ void LLView::onVisibilityChange ( BOOL new_visibility )
BOOL log_visibility_change = LLViewerEventRecorder::instance().getLoggingStatus();
BOOST_FOREACH(LLView* viewp, mChildList)
{
+ if (!viewp)
+ {
+ continue;
+ }
+
// only views that are themselves visible will have their overall visibility affected by their ancestors
old_visibility=viewp->getVisible();