From ce28e056c20bf2723f565bbf464b87781ec248a2 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:42 -0500
Subject: Second Life viewer sources 1.20.2

---
 linden/indra/llcharacter/lljoint.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'linden/indra/llcharacter/lljoint.cpp')

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();
 }
 
 
-- 
cgit v1.1