summaryrefslogtreecommitdiff
path: root/indra/llui/llview.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2012-01-30 15:54:39 -0800
committerLeslie Linden <leslie@lindenlab.com>2012-01-30 15:54:39 -0800
commitfd56967dea7e4c53080a1ef89cc550492baf3fc8 (patch)
tree2a7a7993a550afbd7e92975cc53d633e41404583 /indra/llui/llview.cpp
parentc4084c71386e34f6c28d4c10199eaf1155a2855b (diff)
parent56973912198ba3410d1ab32d1a8a63a1c8c3348e (diff)
Merge with latest
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 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())
{