diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
| commit | 22193b15b82d1a6f0ce8846d122bf3ddcefbf13e (patch) | |
| tree | c6c2b595b3e6c518bcf5450e56fb470fa5c07dba /indra/llui/llview.cpp | |
| parent | f040942f190cfdf10ee577a9b4f6a5c83e752e00 (diff) | |
| parent | 465a3356a2f32362837d5231a21b9151f45f890b (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 ) { |