Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer

2013-10-12 10:01:52 +02:00
parent 69f273eb0e 0261eac2a4
commit e8c286308d
1 changed files with 10 additions and 1 deletions
--- a/indra/llcharacter/lleditingmotion.cpp
+++ b/indra/llcharacter/lleditingmotion.cpp
@@ -215,7 +215,16 @@ BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask)
 	if (!target.isFinite())
 	{
 		llwarns << "Non finite target in editing motion with target distance of " << target_dist << 
-			" and focus point " << focus_pt << " and pointAtPt: " << *pointAtPt << llendl;
+			" and focus point " << focus_pt << " and pointAtPt: ";
+		if (pointAtPt)
+		{
+		  llcont << *pointAtPt;
+		}
+		else
+		{
+		  llcont << "NULL";
+		}
+		llcont << llendl;
 	}
 	
 	mTarget.setPosition( target + mParentJoint.getPosition());