diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-30 22:27:01 -0500 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-30 22:27:01 -0500 |
commit | a39937f9303ce2100ebb40d6fcaa8d36a14e3cb7 (patch) | |
tree | 3c0d951cafadbd90c736cfbb9e2e4329d05407c7 /indra/llui/llview.cpp | |
parent | 6298daf266369dbd3600c5fdf287f9c680b2a897 (diff) | |
parent | bd4c629e38aa2ab7223a5ef3b8e23ad91229b512 (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()) { |