diff options
| author | simon <none@none> | 2013-03-20 11:37:11 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-03-20 11:37:11 -0700 |
| commit | 5dbb0a31da9bb3fb5ff7c5ead5d90808f9e4b797 (patch) | |
| tree | d21b92464a9e6225124d3403edff1d152bf1b550 /indra/llcharacter | |
| parent | d5561a1ada5cf171c8e281e910a7e989496c3705 (diff) | |
MAINT-2510 : Time can go backwards for viewer animation, assert fires.
Reviewed by Kelly
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llkeyframemotion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp index 905d1c2d26..07ef52228e 100644 --- a/indra/llcharacter/llkeyframemotion.cpp +++ b/indra/llcharacter/llkeyframemotion.cpp @@ -672,7 +672,8 @@ BOOL LLKeyframeMotion::onActivate() //----------------------------------------------------------------------------- BOOL LLKeyframeMotion::onUpdate(F32 time, U8* joint_mask) { - llassert(time >= 0.f); + // llassert(time >= 0.f); // This will fire + time = llmax(0.f, time); if (mJointMotionList->mLoop) { |