Updated llcharacter with some bits from Emerald and SnowGlobe

1 files changed, 13 insertions, 10 deletions

diff --git a/linden/indra/llcharacter/llhandmotion.cpp b/linden/indra/llcharacter/llhandmotion.cpp
index 4c97fcd..2499bb5 100644
--- a/linden/indra/llcharacter/llhandmotion.cpp
+++ b/linden/indra/llcharacter/llhandmotion.cpp
@@ -113,9 +113,9 @@ BOOL LLHandMotion::onActivate()
                 // Note: 0 is the default
                 for (S32 i = 1; i < LLHandMotion::NUM_HAND_POSES; i++)
                 {
-                        mCharacter->setVisualParamWeight(gHandPoseNames[i], 0.f);
+                        mCharacter->setVisualParamWeight(getHandPoseName((eHandPose)i).c_str(), 0.f);
                 }
-                mCharacter->setVisualParamWeight(gHandPoseNames[mCurrentPose], 1.f);
+                mCharacter->setVisualParamWeight(getHandPoseName(mCurrentPose).c_str(), 1.f);
                 mCharacter->updateVisualParams();
         }
         return TRUE;
@@ -138,7 +138,7 @@ BOOL LLHandMotion::onUpdate(F32 time, U8* joint_mask)
         {
                 if (mNewPose != HAND_POSE_RELAXED && mNewPose != mCurrentPose)
                 {
-                        mCharacter->setVisualParamWeight(gHandPoseNames[mNewPose], 0.f);
+                        mCharacter->setVisualParamWeight(getHandPoseName(mNewPose).c_str(), 0.f);
                 }
                 mNewPose = HAND_POSE_RELAXED;
         }
@@ -147,7 +147,7 @@ BOOL LLHandMotion::onUpdate(F32 time, U8* joint_mask)
                 // this is a new morph we didn't know about before
                 if (*requestedHandPose != mNewPose && mNewPose != mCurrentPose && mNewPose != HAND_POSE_SPREAD)
                 {
-                        mCharacter->setVisualParamWeight(gHandPoseNames[mNewPose], 0.f);
+                        mCharacter->setVisualParamWeight(getHandPoseName(mNewPose).c_str(), 0.f);
                 }
                 mNewPose = *requestedHandPose;
         }
@@ -166,18 +166,18 @@ BOOL LLHandMotion::onUpdate(F32 time, U8* joint_mask)
 
                 if (mNewPose != HAND_POSE_SPREAD)
                 {
-                        incomingWeight = mCharacter->getVisualParamWeight(gHandPoseNames[mNewPose]);
+                        incomingWeight = mCharacter->getVisualParamWeight(getHandPoseName(mNewPose).c_str());
                         incomingWeight += (timeDelta / HAND_MORPH_BLEND_TIME);
                         incomingWeight = llclamp(incomingWeight, 0.f, 1.f);
-                        mCharacter->setVisualParamWeight(gHandPoseNames[mNewPose], incomingWeight);
+                        mCharacter->setVisualParamWeight(getHandPoseName(mNewPose).c_str(), incomingWeight);
                 }
 
                 if (mCurrentPose != HAND_POSE_SPREAD)
                 {
-                        outgoingWeight = mCharacter->getVisualParamWeight(gHandPoseNames[mCurrentPose]);
+                        outgoingWeight = mCharacter->getVisualParamWeight(getHandPoseName(mCurrentPose).c_str());
                         outgoingWeight -= (timeDelta / HAND_MORPH_BLEND_TIME);
                         outgoingWeight = llclamp(outgoingWeight, 0.f, 1.f);
-                        mCharacter->setVisualParamWeight(gHandPoseNames[mCurrentPose], outgoingWeight);
+                        mCharacter->setVisualParamWeight(getHandPoseName(mCurrentPose).c_str(), outgoingWeight);
                 }
 
                 mCharacter->updateVisualParams();
@@ -199,6 +199,8 @@ void LLHandMotion::onDeactivate()
 {
 }
 
+//Zwag: Changed the defaults here so things look right. Otherwise the hand ends up
+// in a pose that nobody is used to when something messes up.
 //-----------------------------------------------------------------------------
 // LLHandMotion::getHandPoseName()
 //-----------------------------------------------------------------------------
@@ -208,7 +210,8 @@ std::string LLHandMotion::getHandPoseName(eHandPose pose)
         {
                 return std::string(gHandPoseNames[pose]);
         }
-        return LLStringUtil::null;
+        LL_WARNS("Bounds") << "Was passed an invalid hand pose: " << (S32)pose << LL_ENDL;
+        return std::string("Hands_Relaxed");
 }
 
 LLHandMotion::eHandPose LLHandMotion::getHandPose(std::string posename)
@@ -220,7 +223,7 @@ LLHandMotion::eHandPose LLHandMotion::getHandPose(std::string posename)
                         return (eHandPose)pose;
                 }
         }
-        return (eHandPose)0;
+        return (eHandPose)1;
 }
 
 // End