diff options
| author | Richard Linden <none@none> | 2011-05-02 17:57:52 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-02 17:57:52 -0700 |
| commit | d5faa4f38d338777463b7ad6eb3239041d43fe28 (patch) | |
| tree | d57efbda59c9f677b2245bebc97fec129f3f9fad /indra/newview/llpolymorph.cpp | |
| parent | 9a6f06687e5b467f0c049bfbf88c2131eee11ef3 (diff) | |
| parent | 78d76eb4b01e0bd6db41a67d1573a1b841cbe993 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llpolymorph.cpp')
| -rw-r--r-- | indra/newview/llpolymorph.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llpolymorph.cpp b/indra/newview/llpolymorph.cpp index 5a67fd482a..36f8c8d13e 100644 --- a/indra/newview/llpolymorph.cpp +++ b/indra/newview/llpolymorph.cpp @@ -490,6 +490,16 @@ void LLPolyMorphTarget::apply( ESex avatar_sex ) mLastSex = avatar_sex; + // Check for NaN condition (NaN is detected if a variable doesn't equal itself. + if (mCurWeight != mCurWeight) + { + mCurWeight = 0.0; + } + if (mLastWeight != mLastWeight) + { + mLastWeight = mCurWeight+.001; + } + // perform differential update of morph F32 delta_weight = ( getSex() & avatar_sex ) ? (mCurWeight - mLastWeight) : (getDefaultWeight() - mLastWeight); // store last weight |