diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-02-24 16:12:43 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-02-24 16:12:43 +0100 |
| commit | e0d1ddab212103ba11a72783ce3b0a26ea8c0c55 (patch) | |
| tree | 44011ae0491941af0bfc1957d5f3b408c81123a4 /indra/llui/llview.cpp | |
| parent | e615660823e680e824d2db0f1a59917597e64a13 (diff) | |
| parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) | |
Merge with viewer-development
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()) { |