diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-03-10 20:34:43 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-03-10 20:34:43 -0400 |
| commit | 9c29000ba2f8192985ad0bf20889739ad12dd569 (patch) | |
| tree | 3670a18100453ef589a04d40da5aa314b99f5d11 /indra/llcharacter/llkeyframemotion.cpp | |
| parent | 71e237a3f79cd90b432205460fe6e5c6b536d9db (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Merge. Refresh from viewer-release after 3.7.3 release.
Diffstat (limited to 'indra/llcharacter/llkeyframemotion.cpp')
| -rwxr-xr-x | indra/llcharacter/llkeyframemotion.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp index 07ef52228e..2241a59513 100755 --- a/indra/llcharacter/llkeyframemotion.cpp +++ b/indra/llcharacter/llkeyframemotion.cpp @@ -81,7 +81,9 @@ LLKeyframeMotion::JointMotionList::JointMotionList() LLKeyframeMotion::JointMotionList::~JointMotionList() { for_each(mConstraints.begin(), mConstraints.end(), DeletePointer()); + mConstraints.clear(); for_each(mJointMotionArray.begin(), mJointMotionArray.end(), DeletePointer()); + mJointMotionArray.clear(); } U32 LLKeyframeMotion::JointMotionList::dumpDiagInfo() @@ -447,6 +449,7 @@ LLKeyframeMotion::LLKeyframeMotion(const LLUUID &id) LLKeyframeMotion::~LLKeyframeMotion() { for_each(mConstraints.begin(), mConstraints.end(), DeletePointer()); + mConstraints.clear(); } //----------------------------------------------------------------------------- |