diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
| commit | a3f3ab7e113e44309461b26399d627814f0ce4f9 (patch) | |
| tree | 695b2a41f8d31330634ef59e7d6ece526242fd86 /indra/llcharacter/lljoint.cpp | |
| parent | d85247e63e5ff0b488211b62429a4895b48dee27 (diff) | |
QAR-449 Viewer 1.20 RC 1
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
Diffstat (limited to 'indra/llcharacter/lljoint.cpp')
| -rw-r--r-- | indra/llcharacter/lljoint.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index 00ec8e5068..1f3e39daa3 100644 --- a/indra/llcharacter/lljoint.cpp +++ b/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(); } |