diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-30 10:15:08 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-30 10:15:08 -0500 |
commit | 56973912198ba3410d1ab32d1a8a63a1c8c3348e (patch) | |
tree | c3d03123918bf832613913a7688cca02babe7515 /indra/llui/llview.cpp | |
parent | dee66ccb3af6e8590c089a6fe1f1a0d0ffeacab8 (diff) | |
parent | 4ef9277761b5faee2825177112939b72c563a4ea (diff) |
merge
Diffstat (limited to 'indra/llui/llview.cpp')
-rw-r--r-- | indra/llui/llview.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 004681325f..e1ee0a5b14 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -1093,6 +1093,11 @@ void LLView::drawChildren() { child_list_reverse_iter_t child = child_iter++; LLView *viewp = *child; + + if (viewp == NULL) + { + continue; + } if (viewp->getVisible() && viewp->getRect().isValid()) { |