diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 18:50:42 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 18:50:42 +0000 |
| commit | 83b74ef511ac49b02465ece9c35fc80066de729d (patch) | |
| tree | bcfee65c60b9868ab4d1f5cb7a35b112c15c96b9 /indra/newview/lldriverparam.cpp | |
| parent | 56d43b9c79ede83c563c4d6d1f60ea831926e1ac (diff) | |
| parent | bac0248f3b9a2594a3612cf33a246b3e61f89aca (diff) | |
merge from viewer2 trunk.
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()) ) |