Second Life viewer sources 1.14.0.0

1 files changed, 60 insertions, 27 deletions

diff --git a/linden/indra/llcharacter/lljoint.cpp b/linden/indra/llcharacter/lljoint.cpp
index 4ef9835..4102612 100644
--- a/linden/indra/llcharacter/lljoint.cpp
+++ b/linden/indra/llcharacter/lljoint.cpp
@@ -69,8 +69,9 @@ LLJoint::LLJoint(const std::string &name, LLJoint *parent)
 
         setName(name);
         if (parent)
+        {
                 parent->addChild( this );
-
+        }
         touch();
 }
 
@@ -80,6 +81,10 @@ LLJoint::LLJoint(const std::string &name, LLJoint *parent)
 //-----------------------------------------------------------------------------
 LLJoint::~LLJoint()
 {
+        if (mParent)
+        {
+                mParent->removeChild( this );
+        }
         removeAllChildren();
 }
 
@@ -91,7 +96,9 @@ void LLJoint::setup(const std::string &name, LLJoint *parent)
 {
         setName(name);
         if (parent)
+        {
                 parent->addChild( this );
+        }
 }
 
 //-----------------------------------------------------------------------------
@@ -109,11 +116,11 @@ void LLJoint::touch(U32 flags)
                 {
                         child_flags |= POSITION_DIRTY;
                 }
-                
-                for (   LLJoint *joint = mChildren.getFirstData();
-                                joint != NULL;
-                                joint = mChildren.getNextData() )
+
+                for (child_list_t::iterator iter = mChildren.begin();
+                         iter != mChildren.end(); ++iter)
                 {
+                        LLJoint* joint = *iter;
                         joint->touch(child_flags);
                 }
         }
@@ -140,13 +147,15 @@ LLJoint *LLJoint::findJoint( const std::string &name )
         if (name == getName())
                 return this;
 
-        for (   LLJoint *j = mChildren.getFirstData();
-                        j != NULL;
-                        j = mChildren.getNextData() )
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
         {
-                LLJoint *found = j->findJoint(name);
+                LLJoint* joint = *iter;
+                LLJoint *found = joint->findJoint(name);
                 if (found)
+                {
                         return found;
+                }
         }
 
         return NULL;    
@@ -156,12 +165,12 @@ LLJoint *LLJoint::findJoint( const std::string &name )
 //--------------------------------------------------------------------
 // addChild()
 //--------------------------------------------------------------------
-void LLJoint::addChild(LLJoint *joint)
+void LLJoint::addChild(LLJoint* joint)
 {
         if (joint->mParent)
                 joint->mParent->removeChild(joint);
 
-        mChildren.addDataAtEnd(joint);
+        mChildren.push_back(joint);
         joint->mXform.setParent(&mXform);
         joint->mParent = this;  
         joint->touch();
@@ -171,9 +180,13 @@ void LLJoint::addChild(LLJoint *joint)
 //--------------------------------------------------------------------
 // removeChild()
 //--------------------------------------------------------------------
-void LLJoint::removeChild(LLJoint *joint)
+void LLJoint::removeChild(LLJoint* joint)
 {
-        this->mChildren.removeData(joint);
+        child_list_t::iterator iter = std::find(mChildren.begin(), mChildren.end(), joint);
+        if (iter != mChildren.end())
+        {
+                this->mChildren.erase(iter);
+        }
         joint->mXform.setParent(NULL);
         joint->mParent = NULL;
         joint->touch();
@@ -185,11 +198,15 @@ void LLJoint::removeChild(LLJoint *joint)
 //--------------------------------------------------------------------
 void LLJoint::removeAllChildren()
 {
-        for (   LLJoint *joint = mChildren.getFirstData();
-                        joint != NULL;
-                        joint = mChildren.getNextData() )
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end();)
         {
-                removeChild(joint);
+                child_list_t::iterator curiter = iter++;
+                LLJoint* joint = *curiter;
+                mChildren.erase(curiter);
+                joint->mXform.setParent(NULL);
+                joint->mParent = NULL;
+                joint->touch();
         }
 }
 
@@ -208,8 +225,11 @@ const LLVector3& LLJoint::getPosition()
 //--------------------------------------------------------------------
 void LLJoint::setPosition( const LLVector3& pos )
 {
-        mXform.setPosition(pos);
-        touch(MATRIX_DIRTY | POSITION_DIRTY);
+//      if (mXform.getPosition() != pos)
+        {
+                mXform.setPosition(pos);
+                touch(MATRIX_DIRTY | POSITION_DIRTY);
+        }
 }
 
 
@@ -276,8 +296,11 @@ void LLJoint::setRotation( const LLQuaternion& rot )
 {
         if (rot.isFinite())
         {
-                mXform.setRotation(rot);
-                touch(MATRIX_DIRTY | ROTATION_DIRTY);
+        //      if (mXform.getRotation() != rot)
+                {
+                        mXform.setRotation(rot);
+                        touch(MATRIX_DIRTY | ROTATION_DIRTY);
+                }
         }
 }
 
@@ -339,8 +362,12 @@ const LLVector3& LLJoint::getScale()
 //--------------------------------------------------------------------
 void LLJoint::setScale( const LLVector3& scale )
 {
-        mXform.setScale(scale);
-        touch();
+//      if (mXform.getScale() != scale)
+        {
+                mXform.setScale(scale);
+                touch();
+        }
+
 }
 
 
@@ -412,14 +439,18 @@ void LLJoint::updateWorldPRSParent()
 // updateWorldMatrixChildren()
 //-----------------------------------------------------------------------------
 void LLJoint::updateWorldMatrixChildren()
-{
+{       
+        if (!this->mUpdateXform) return;
+
         if (mDirtyFlags & MATRIX_DIRTY)
         {
                 updateWorldMatrix();
         }
-        for (LLJoint *child = mChildren.getFirstData(); child; child = mChildren.getNextData())
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
         {
-                child->updateWorldMatrixChildren();
+                LLJoint* joint = *iter;
+                joint->updateWorldMatrixChildren();
         }
 }
 
@@ -494,8 +525,10 @@ void LLJoint::clampRotation(LLQuaternion old_rot, LLQuaternion new_rot)
 {
         LLVector3 main_axis(1.f, 0.f, 0.f);
 
-        for (LLJoint* joint = mChildren.getFirstData(); joint; joint = mChildren.getNextData())
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
         {
+                LLJoint* joint = *iter;
                 if (joint->isAnimatable())
                 {
                         main_axis = joint->getPosition();