diff options
| author | Richard Linden <none@none> | 2013-09-09 18:58:41 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-09 18:58:41 -0700 |
| commit | 52da9f5f49e0e300943abc3afa6944e6bee0cdd1 (patch) | |
| tree | b61a1aa1775b3faca1baf492a969a51d7ce8b3fe /indra/llcharacter/lltargetingmotion.cpp | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
| parent | 91850b6cfacb32ed32265ebd37ce7690dd79a0b0 (diff) | |
merge with viewer-release
Diffstat (limited to 'indra/llcharacter/lltargetingmotion.cpp')
| -rwxr-xr-x | indra/llcharacter/lltargetingmotion.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcharacter/lltargetingmotion.cpp b/indra/llcharacter/lltargetingmotion.cpp index 489aef923c..37e61e936d 100755 --- a/indra/llcharacter/lltargetingmotion.cpp +++ b/indra/llcharacter/lltargetingmotion.cpp @@ -80,7 +80,7 @@ LLMotion::LLMotionInitStatus LLTargetingMotion::onInitialize(LLCharacter *charac !mTorsoJoint || !mRightHandJoint) { - llwarns << "Invalid skeleton for targeting motion!" << llendl; + LL_WARNS() << "Invalid skeleton for targeting motion!" << LL_ENDL; return STATUS_FAILURE; } @@ -106,7 +106,7 @@ BOOL LLTargetingMotion::onActivate() //----------------------------------------------------------------------------- BOOL LLTargetingMotion::onUpdate(F32 time, U8* joint_mask) { - F32 slerp_amt = LLCriticalDamp::getInterpolant(TORSO_TARGET_HALF_LIFE); + F32 slerp_amt = LLSmoothInterpolation::getInterpolant(TORSO_TARGET_HALF_LIFE); LLVector3 target; LLVector3* lookAtPoint = (LLVector3*)mCharacter->getAnimationData("LookAtPoint"); |