diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-07 12:55:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-07 12:55:12 -0400 |
| commit | ef8ce5bf5eb3325dec8a51d27ca01ddab47f183c (patch) | |
| tree | f1ad2e9d551a3be4fe0abb68816d8c0dd9294fe4 /indra/newview/llpolymorph.cpp | |
| parent | 0a802ae351153008b40d42106c866836d0ee4954 (diff) | |
SH-1319: Fix for disappearing torso sections on avatars
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 |