livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-2510 : Time can go backwards for viewer animation, assert fires. 

Reviewed by Kelly
master
simon 2013-03-20 11:37:11 -07:00
parent d5561a1ada
commit 5dbb0a31da
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llcharacter/llkeyframemotion.cpp
View File

@ -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)
{

6
indra/newview/llmeshrepository.cpp
View File

@ -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,