summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-08 13:47:14 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-08 13:47:14 +0000
commit4d9bcc2c8f303464c3664a0a7304a1bc2d658e2e (patch)
tree834d352ed215a06aff5c615066b0176c21c4c889
parent7660c19ce8fed013eea06450fe6deb4ae92f3ead (diff)
Fix a crash in the LLModelPreview floater. This is just some sloppy generosity in data acceptance - the probable 'real' fix has been sent to qarl+davep for comment.
-rw-r--r--indra/llui/llview.cpp2
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 )
{