From 5dbb0a31da9bb3fb5ff7c5ead5d90808f9e4b797 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Wed, 20 Mar 2013 11:37:11 -0700
Subject: MAINT-2510 : Time can go backwards for viewer animation, assert
 fires. Reviewed by Kelly

---
 indra/llcharacter/llkeyframemotion.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/llcharacter')

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)
 	{
-- 
cgit v1.2.3