diff options
author | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
commit | 54bba824228162724a1d46d9c7900e9aa7a077a3 (patch) | |
tree | 3355699f63f141e5fc0546dfe279b8aa65d40e07 /indra/llcharacter/llkeyframemotion.cpp | |
parent | f813a25224081e68d4772676909d2cff14407486 (diff) | |
parent | 78eada5b6c3a8d20a2ea49887ab7c091e4b6fa14 (diff) |
Pull merge from lindenlab/viewer-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(); } //----------------------------------------------------------------------------- |