aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcharacter/lleditingmotion.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-28 17:21:23 -0500
committerJacek Antonelli2008-09-28 17:21:46 -0500
commit31e7c77a411d94bc87f0232588b339149bb29a49 (patch)
tree49e487700e91713e620e4d33f20b7f7afb5a2fa9 /linden/indra/llcharacter/lleditingmotion.cpp
parentSecond Life viewer sources 1.21.2-RC (diff)
downloadmeta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.zip
meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.gz
meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.bz2
meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.xz
Second Life viewer sources 1.21.3-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/llcharacter/lleditingmotion.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/linden/indra/llcharacter/lleditingmotion.cpp b/linden/indra/llcharacter/lleditingmotion.cpp
index c693e6d..b7539ee 100644
--- a/linden/indra/llcharacter/lleditingmotion.cpp
+++ b/linden/indra/llcharacter/lleditingmotion.cpp
@@ -186,6 +186,12 @@ BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask)
186 } 186 }
187 187
188 focus_pt += mCharacter->getCharacterPosition(); 188 focus_pt += mCharacter->getCharacterPosition();
189 if (!llfinite(focus_pt.magVecSquared()))
190 {
191 LLVector3 tmp = mCharacter->getCharacterPosition() ;
192 llerrs << "Non finite focus point in editing motion. focus point: " << focus_pt << " and character position: " <<
193 tmp << " and pointAtPt: " << pointAtPt << llendl;
194 }
189 195
190 // propagate joint positions to kinematic chain 196 // propagate joint positions to kinematic chain
191 mParentJoint.setPosition( mParentState->getJoint()->getWorldPosition() ); 197 mParentJoint.setPosition( mParentState->getJoint()->getWorldPosition() );
@@ -220,7 +226,7 @@ BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask)
220 if (!target.isFinite()) 226 if (!target.isFinite())
221 { 227 {
222 llerrs << "Non finite target in editing motion with target distance of " << target_dist << 228 llerrs << "Non finite target in editing motion with target distance of " << target_dist <<
223 " and focus point " << focus_pt << llendl; 229 " and focus point " << focus_pt << " and pointAtPt: " << pointAtPt << llendl;
224 } 230 }
225 231
226 mTarget.setPosition( target + mParentJoint.getPosition()); 232 mTarget.setPosition( target + mParentJoint.getPosition());