diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 11:19:51 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 11:19:51 +0000 |
| commit | 44cfa948c7a8bf6786b204c35973ac879cdfc491 (patch) | |
| tree | c34ec0cc9e0c73a72071463d71caa068d2af2659 /indra/newview/lldriverparam.cpp | |
| parent | a4ef5e2b0d4e36aa98f2e4074f4ddd4cad3d3106 (diff) | |
| parent | fc1af768b800c890cda8ef3e8b9ee2537ca1d92a (diff) | |
merge.
Diffstat (limited to 'indra/newview/lldriverparam.cpp')
| -rw-r--r-- | indra/newview/lldriverparam.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lldriverparam.cpp b/indra/newview/lldriverparam.cpp index 8ebfa471f3..830e975e8a 100644 --- a/indra/newview/lldriverparam.cpp +++ b/indra/newview/lldriverparam.cpp @@ -432,6 +432,12 @@ const LLVector3* LLDriverParam::getNextDistortion(U32 *index, LLPolyMesh **poly_ } } + llassert(driven); + if (!driven) + { + return NULL; // shouldn't happen, but... + } + // We're already in the middle of a param's distortions, so get the next one. const LLVector3* v = driven->mParam->getNextDistortion( index, poly_mesh ); if( (!v) && (iter != mDriven.end()) ) |