diff options
| author | JJ Linden <jj@lindenlab.com> | 2013-10-10 16:44:22 -0700 |
|---|---|---|
| committer | JJ Linden <jj@lindenlab.com> | 2013-10-10 16:44:22 -0700 |
| commit | dc431ea6d2e4e13ab505b8118d6f9220630efe96 (patch) | |
| tree | 8c37de1ca61cf29e3d1863ce08d34acff666e9ab /indra/llcharacter/llkeyframemotion.cpp | |
| parent | 3aea5a5a6ab0e6d96fe581a9bab9896956129ba3 (diff) | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
merged in recent changes
Diffstat (limited to 'indra/llcharacter/llkeyframemotion.cpp')
| -rwxr-xr-x | indra/llcharacter/llkeyframemotion.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp index c6f45bffa2..07ef52228e 100755 --- 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) { @@ -2304,3 +2305,4 @@ LLKeyframeMotion::JointConstraint::~JointConstraint() } // End + |