diff options
author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/llcharacter/lleditingmotion.cpp | |
parent | 1.1 version final (diff) | |
parent | Merge branch 'sl-base-1.22' into next (diff) | |
download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz |
Moved base up to 1.22
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llcharacter/lleditingmotion.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llcharacter/lleditingmotion.cpp b/linden/indra/llcharacter/lleditingmotion.cpp index b7539ee..a2d126a 100644 --- a/linden/indra/llcharacter/lleditingmotion.cpp +++ b/linden/indra/llcharacter/lleditingmotion.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -190,7 +190,7 @@ BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask) | |||
190 | { | 190 | { |
191 | LLVector3 tmp = mCharacter->getCharacterPosition() ; | 191 | LLVector3 tmp = mCharacter->getCharacterPosition() ; |
192 | llerrs << "Non finite focus point in editing motion. focus point: " << focus_pt << " and character position: " << | 192 | llerrs << "Non finite focus point in editing motion. focus point: " << focus_pt << " and character position: " << |
193 | tmp << " and pointAtPt: " << pointAtPt << llendl; | 193 | tmp << " and pointAtPt: " << *pointAtPt << llendl; |
194 | } | 194 | } |
195 | 195 | ||
196 | // propagate joint positions to kinematic chain | 196 | // propagate joint positions to kinematic chain |
@@ -226,7 +226,7 @@ BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask) | |||
226 | if (!target.isFinite()) | 226 | if (!target.isFinite()) |
227 | { | 227 | { |
228 | 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 << |
229 | " and focus point " << focus_pt << " and pointAtPt: " << pointAtPt << llendl; | 229 | " and focus point " << focus_pt << " and pointAtPt: " << *pointAtPt << llendl; |
230 | } | 230 | } |
231 | 231 | ||
232 | mTarget.setPosition( target + mParentJoint.getPosition()); | 232 | mTarget.setPosition( target + mParentJoint.getPosition()); |