diff options
| author | James Cook <james@lindenlab.com> | 2010-02-11 10:09:23 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-11 10:09:23 -0800 |
| commit | 9dd7924b19651abf393f7b0dee632904a6b8e52a (patch) | |
| tree | b22f8ca3ecdf4ec8e5288102912dccdd7289f51f /indra/llui/llview.cpp | |
| parent | 301f250c1cd77711c0234d8ed4089453712f834e (diff) | |
| parent | 39fe664b97b946daf7984b946fede6f04ae731c4 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index f1b08c380b..63e627ceb5 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -1720,6 +1720,7 @@ LLView* LLView::findChildView(const std::string& name, BOOL recurse) const for ( child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it) { LLView* childp = *child_it; + llassert(childp); if (childp->getName() == name) { return childp; @@ -1731,6 +1732,7 @@ LLView* LLView::findChildView(const std::string& name, BOOL recurse) const for ( child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it) { LLView* childp = *child_it; + llassert(childp); LLView* viewp = childp->findChildView(name, recurse); if ( viewp ) { |