Merge. Refresh from viewer-release after 3.7.4 release.

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();
 }
 
 //-----------------------------------------------------------------------------