diff options
author | Leslie Linden <leslie@lindenlab.com> | 2012-01-17 11:07:11 -0800 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-17 11:07:11 -0800 |
commit | dc0573be6cff912a20a2eab2ebd6ce61dc687ba6 (patch) | |
tree | d6a8012cd845931d994d587cd3f34e1b988175fb /indra/llui/llview.cpp | |
parent | 1f9529c0c2b02c4ceee912f8ecb35181174cc7cc (diff) | |
parent | 577479a3e53ef152da191e3a004aeb34f0815658 (diff) |
Merge with viewer-dd, attempt #1
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()) { |