Second Life viewer sources 1.19.0.0

1 files changed, 10 insertions, 8 deletions

diff --git a/linden/indra/llcharacter/lltargetingmotion.cpp b/linden/indra/llcharacter/lltargetingmotion.cpp
index 1676a08..0f160a4 100644
--- a/linden/indra/llcharacter/lltargetingmotion.cpp
+++ b/linden/indra/llcharacter/lltargetingmotion.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -55,6 +55,8 @@ LLTargetingMotion::LLTargetingMotion(const LLUUID &id) : LLMotion(id)
 {
         mCharacter = NULL;
         mName = "targeting";
+
+        mTorsoState = new LLJointState;
 }
 
 
@@ -87,11 +89,11 @@ LLMotion::LLMotionInitStatus LLTargetingMotion::onInitialize(LLCharacter *charac
                 return STATUS_FAILURE;
         }
 
-        mTorsoState.setJoint( mTorsoJoint );
+        mTorsoState->setJoint( mTorsoJoint );
 
         // add joint states to the pose
-        mTorsoState.setUsage(LLJointState::ROT);
-        addJointState( &mTorsoState );
+        mTorsoState->setUsage(LLJointState::ROT);
+        addJointState( mTorsoState );
 
         return STATUS_SUCCESS;
 }
@@ -127,7 +129,7 @@ BOOL LLTargetingMotion::onUpdate(F32 time, U8* joint_mask)
         }
         
         //LLVector3 target_plane_normal = LLVector3(1.f, 0.f, 0.f) * mPelvisJoint->getWorldRotation();
-        //LLVector3 torso_dir = LLVector3(1.f, 0.f, 0.f) * (mTorsoJoint->getWorldRotation() * mTorsoState.getRotation());
+        //LLVector3 torso_dir = LLVector3(1.f, 0.f, 0.f) * (mTorsoJoint->getWorldRotation() * mTorsoState->getRotation());
 
         LLVector3 skyward(0.f, 0.f, 1.f);
         LLVector3 left(skyward % target);
@@ -151,14 +153,14 @@ BOOL LLTargetingMotion::onUpdate(F32 time, U8* joint_mask)
         new_torso_rot = new_torso_rot * ~cur_torso_rot;
 
         // slerp from current additive rotation to ideal additive rotation
-        new_torso_rot = nlerp(slerp_amt, mTorsoState.getRotation(), new_torso_rot);
+        new_torso_rot = nlerp(slerp_amt, mTorsoState->getRotation(), new_torso_rot);
 
         // constraint overall torso rotation
         LLQuaternion total_rot = new_torso_rot * mTorsoJoint->getRotation();
         total_rot.constrain(F_PI_BY_TWO * 0.8f);
         new_torso_rot = total_rot * ~mTorsoJoint->getRotation();
 
-        mTorsoState.setRotation(new_torso_rot);
+        mTorsoState->setRotation(new_torso_rot);
 
         return result;
 }