Second Life viewer sources 1.17.3.0

5 files changed, 24 insertions, 25 deletions

diff --git a/linden/indra/llcharacter/llheadrotmotion.cpp b/linden/indra/llcharacter/llheadrotmotion.cpp
index cfab048..73f8e8b 100644
--- a/linden/indra/llcharacter/llheadrotmotion.cpp
+++ b/linden/indra/llcharacter/llheadrotmotion.cpp
@@ -438,6 +438,10 @@ BOOL LLEyeMotion::onUpdate(F32 time, U8* joint_mask)
                 up.setVec(eye_look_at % left);
 
                 target_eye_rot = LLQuaternion(eye_look_at, left, up);
+                // convert target rotation to head-local coordinates
+                target_eye_rot *= ~mHeadJoint->getWorldRotation();
+                // constrain target orientation to be in front of avatar's face
+                target_eye_rot.constrain(EYE_ROT_LIMIT_ANGLE);
 
                 // calculate vergence
                 F32 interocular_dist = (mLeftEyeState.getJoint()->getWorldPosition() - mRightEyeState.getJoint()->getWorldPosition()).magVec();
@@ -446,7 +450,7 @@ BOOL LLEyeMotion::onUpdate(F32 time, U8* joint_mask)
         }
         else
         {
-                target_eye_rot = mHeadJoint->getWorldRotation();
+                target_eye_rot = LLQuaternion::DEFAULT;
                 vergence = 0.f;
         }
 
@@ -488,18 +492,8 @@ BOOL LLEyeMotion::onUpdate(F32 time, U8* joint_mask)
         vergence_quat.transQuat();
         right_eye_rot = vergence_quat * eye_jitter_rot * right_eye_rot;
 
-        //set final eye rotations
-        // start with left
-        LLQuaternion tQw = mLeftEyeState.getJoint()->getParent()->getWorldRotation();
-        LLQuaternion tQh = left_eye_rot * ~tQw;
-        tQh.constrain(EYE_ROT_LIMIT_ANGLE);
-        mLeftEyeState.setRotation( tQh );
-
-        // now do right eye
-        tQw = mRightEyeState.getJoint()->getParent()->getWorldRotation();
-        tQh = right_eye_rot * ~tQw;
-        tQh.constrain(EYE_ROT_LIMIT_ANGLE);
-        mRightEyeState.setRotation( tQh );
+        mLeftEyeState.setRotation( left_eye_rot );
+        mRightEyeState.setRotation( right_eye_rot );
 
         return TRUE;
 }
diff --git a/linden/indra/llcharacter/lljointstate.h b/linden/indra/llcharacter/lljointstate.h
index 8b55410..5311374 100644
--- a/linden/indra/llcharacter/lljointstate.h
+++ b/linden/indra/llcharacter/lljointstate.h
@@ -118,7 +118,7 @@ public:
         void setScale( const LLVector3& scale ) { llassert(mUsage & SCALE); mScale = scale; }
 
         // get/set priority
-        const LLJoint::JointPriority getPriority()              { return mPriority; }
+        LLJoint::JointPriority getPriority()            { return mPriority; }
         void setPriority( const LLJoint::JointPriority priority ) { mPriority = priority; }
 };
 
diff --git a/linden/indra/llcharacter/llmotioncontroller.cpp b/linden/indra/llcharacter/llmotioncontroller.cpp
index 3ef35ec..2427fd8 100644
--- a/linden/indra/llcharacter/llmotioncontroller.cpp
+++ b/linden/indra/llcharacter/llmotioncontroller.cpp
@@ -360,7 +360,7 @@ BOOL LLMotionController::startMotion(const LLUUID &id, F32 start_offset)
         {       
                 if (motion->isStopped()) // motion has been stopped
                 {
-                        deactivateMotion(motion);
+                        deactivateMotion(motion, false);
                 }
                 else if (mTime < motion->mSendStopTimestamp)    // motion is still active
                 {
@@ -396,7 +396,7 @@ BOOL LLMotionController::stopMotionLocally(const LLUUID &id, BOOL stop_immediate
 
                 if (stop_immediate)
                 {
-                        deactivateMotion(motion);
+                        deactivateMotion(motion, false);
                 }
                 return TRUE;
         }
@@ -492,7 +492,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
                 {
                         if (motionp->isStopped() && mTime > motionp->getStopTime() + motionp->getEaseOutDuration())
                         {
-                                deactivateMotion(motionp);
+                                deactivateMotion(motionp, false);
                         }
                         else if (motionp->isStopped() && mTime > motionp->getStopTime())
                         {
@@ -546,8 +546,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
                         {
                                 if (motionp->isStopped() && mTime > motionp->getStopTime() + motionp->getEaseOutDuration())
                                 {
-                                        posep->setWeight(0.f);
-                                        deactivateMotion(motionp);
+                                        deactivateMotion(motionp, true);
                                 }
                                 continue;
                         }
@@ -573,8 +572,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
                         }
                         else
                         {
-                                posep->setWeight(0.f);
-                                deactivateMotion(motionp);
+                                deactivateMotion(motionp, true);
                                 continue;
                         }
                 }
@@ -822,8 +820,15 @@ BOOL LLMotionController::activateMotion(LLMotion *motion, F32 time)
 //-----------------------------------------------------------------------------
 // deactivateMotion()
 //-----------------------------------------------------------------------------
-BOOL LLMotionController::deactivateMotion(LLMotion *motion)
+BOOL LLMotionController::deactivateMotion(LLMotion *motion, bool remove_weight)
 {
+        if( remove_weight )
+        {
+                // immediately remove pose weighting instead of letting it time out
+                LLPose *posep = motion->getPose();
+                posep->setWeight(0.f);
+        }
+        
         motion->deactivate();
         mActiveMotions.remove(motion);
 
diff --git a/linden/indra/llcharacter/llmotioncontroller.h b/linden/indra/llcharacter/llmotioncontroller.h
index 94149da..959a16a 100644
--- a/linden/indra/llcharacter/llmotioncontroller.h
+++ b/linden/indra/llcharacter/llmotioncontroller.h
@@ -182,7 +182,7 @@ protected:
         void deleteAllMotions();
         void addLoadedMotion(LLMotion *motion);
         BOOL activateMotion(LLMotion *motion, F32 time);
-        BOOL deactivateMotion(LLMotion *motion);
+        BOOL deactivateMotion(LLMotion *motion, bool remove_weight);
         void updateRegularMotions();
         void updateAdditiveMotions();
         void resetJointSignatures();
diff --git a/linden/indra/llcharacter/llvisualparam.h b/linden/indra/llcharacter/llvisualparam.h
index ec19fa0..ddd0469 100644
--- a/linden/indra/llcharacter/llvisualparam.h
+++ b/linden/indra/llcharacter/llvisualparam.h
@@ -108,7 +108,7 @@ public:
         virtual void                    stopAnimating(BOOL set_by_user);
 
         // Interface methods
-        const S32                               getID()                         { return mID; }
+        S32                                             getID()                         { return mID; }
         void                                    setID(S32 id)           { llassert(!mInfo); mID = id; }
         
         const LLString&                 getName() const                         { return mInfo->mName; }
@@ -120,7 +120,7 @@ public:
         void                                    setMaxDisplayName(const char* s) { mInfo->mMaxName = s; }
         void                                    setMinDisplayName(const char* s) { mInfo->mMinName = s; }
 
-        const EVisualParamGroup getGroup()                      { return mInfo->mGroup; }
+        EVisualParamGroup               getGroup()                      { return mInfo->mGroup; }
         F32                                             getMinWeight()          { return mInfo->mMinWeight; }
         F32                                             getMaxWeight()          { return mInfo->mMaxWeight; }
         F32                                             getDefaultWeight()      { return mInfo->mDefaultWeight; }