From 0e5dd803dbee72168e9d5f76abca573363ec3db0 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 20 Sep 2012 20:23:54 +0200
Subject: [PATCH] FIRE-7113: Crash fix for non finite target in editing motion

---
 indra/llcharacter/lleditingmotion.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/indra/llcharacter/lleditingmotion.cpp b/indra/llcharacter/lleditingmotion.cpp
index 66b3c2bd25..e06df52c1e 100644
--- a/indra/llcharacter/lleditingmotion.cpp
+++ b/indra/llcharacter/lleditingmotion.cpp
@@ -214,8 +214,13 @@ BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask)
 	target = target * target_dist;
 	if (!target.isFinite())
 	{
-		llerrs << "Non finite target in editing motion with target distance of " << target_dist << 
+		// <FS:Ansariel> FIRE-7113: Don't error out here, set a fail-safe target vector
+		//llerrs << "Non finite target in editing motion with target distance of " << target_dist << 
+		//	" and focus point " << focus_pt << llendl;
+		llwarns << "Non finite target in editing motion with target distance of " << target_dist << 
 			" and focus point " << focus_pt << llendl;
+		target.setVec(1.f, 1.f, 1.f);
+		// </FS:Ansariel>
 	}
 	
 	mTarget.setPosition( target + mParentJoint.getPosition());