summaryrefslogtreecommitdiff
path: root/indra/llui/llview.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-01-17 22:43:12 -0800
committerMerov Linden <merov@lindenlab.com>2012-01-17 22:43:12 -0800
commit07294e04983c6c24ec8cd5d589c4a0a8fda87431 (patch)
tree53e09995bbb8b9697a4d07dca7521cc57abcf70a /indra/llui/llview.cpp
parent9025656bba1520b6b442ce0a359fad0217e6d970 (diff)
parent3b81e882897e1b161e4becaafaf3fc93d482ce65 (diff)
Pull from viewer-experience
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())
{