llcharacter merge

2016-04-04 23:45:15 -05:00
parent 989c40e59a
commit 0fa7848b19
5 changed files with 43 additions and 111 deletions
--- a/indra/llcharacter/lleditingmotion.cpp
+++ b/indra/llcharacter/lleditingmotion.cpp
@@ -225,6 +225,7 @@ BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask)
 		  LL_CONT << "NULL";
 		}
 		LL_CONT << LL_ENDL;
+		target.setVec(1.f, 1.f, 1.f);
 	}
 	
 	mTarget.setPosition( target + mParentJoint.getPosition());