diff options
| author | Palmer <palmer@lindenlab.com> | 2009-12-07 16:03:56 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-12-07 16:03:56 -0800 |
| commit | 85488f54148b2dba02eadcbd50ccbb552638c3c7 (patch) | |
| tree | dbb248900527cac25c307970fb5c817b90b715e7 /indra/newview/lldrawable.h | |
| parent | ee159d8e742a7281f304fc45b692c111706d294e (diff) | |
| parent | 9d3968bb837828568bf58113b8315c8ca2e8dae1 (diff) | |
Merge of viewer 2 changes
Diffstat (limited to 'indra/newview/lldrawable.h')
| -rw-r--r-- | indra/newview/lldrawable.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index 5a10b688da..27c9ab319a 100644 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -314,8 +314,10 @@ private: inline LLFace* LLDrawable::getFace(const S32 i) const { - llassert((U32)i < mFaces.size()); - llassert(mFaces[i]); + if ((U32) i >= mFaces.size()) + { + return NULL; + } return mFaces[i]; } |