summaryrefslogtreecommitdiff
path: root/indra/llui/llview.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-09-14 09:55:18 -0700
committerRider Linden <rider@lindenlab.com>2016-09-14 09:55:18 -0700
commit51236b7c9c2e74639be6360b42154f21fecc9df8 (patch)
treeb720cf9f432e3bf6c2b100d25a0fce48e4be4219 /indra/llui/llview.cpp
parent694fe9cfc5a63f825bf77f4630c2da57c16171bf (diff)
parent4fb100ac7a33174883184f1320d0beac08ead3a7 (diff)
Merge
Diffstat (limited to 'indra/llui/llview.cpp')
-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();