1 files changed, 5 insertions, 4 deletions

diff --git a/linden/indra/llcharacter/lljoint.cpp b/linden/indra/llcharacter/lljoint.cpp
index b7a51f1..4611f52 100644
--- a/linden/indra/llcharacter/lljoint.cpp
+++ b/linden/indra/llcharacter/lljoint.cpp
@@ -189,11 +189,12 @@ void LLJoint::removeChild(LLJoint* joint)
         child_list_t::iterator iter = std::find(mChildren.begin(), mChildren.end(), joint);
         if (iter != mChildren.end())
         {
-                this->mChildren.erase(iter);
+                mChildren.erase(iter);
+        
+                joint->mXform.setParent(NULL);
+                joint->mParent = NULL;
+                joint->touch();
         }
-        joint->mXform.setParent(NULL);
-        joint->mParent = NULL;
-        joint->touch();
 }