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 | |
| parent | d5561a1ada5cf171c8e281e910a7e989496c3705 (diff) | |
MAINT-2510 : Time can go backwards for viewer animation, assert fires.
Reviewed by Kelly
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcharacter/llkeyframemotion.cpp | 3 | ||||
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 6 |
2 files changed, 5 insertions, 4 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) { diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 306f29f703..7a857ea7be 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -288,7 +288,7 @@ public: ~LLMeshSkinInfoResponder() { - llassert(mProcessed); + //llassert(mProcessed); this will assert due to a timeout (not handled?) MAINT-2511 } virtual void completedRaw(U32 status, const std::string& reason, @@ -313,7 +313,7 @@ public: ~LLMeshDecompositionResponder() { - llassert(mProcessed); + //llassert(mProcessed); this will assert due to a timeout (not handled?) MAINT-2511 } virtual void completedRaw(U32 status, const std::string& reason, @@ -338,7 +338,7 @@ public: ~LLMeshPhysicsShapeResponder() { - llassert(mProcessed); + //llassert(mProcessed); this will assert due to a timeout (not handled?) MAINT-2511 } virtual void completedRaw(U32 status, const std::string& reason, |