From d7b902d57503dddca59c3d7a772e4f6a454afa7b Mon Sep 17 00:00:00 2001
From: Baker Linden <baker@lindenlab.com>
Date: Fri, 14 Feb 2014 13:56:36 -0800
Subject: [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown - Added clear()
 after DeletePointer() call to hopfully fix this...

---
 indra/llcharacter/llbvhloader.cpp      | 1 +
 indra/llcharacter/llkeyframemotion.cpp | 3 +++
 indra/llcharacter/llmultigesture.cpp   | 1 +
 3 files changed, 5 insertions(+)

(limited to 'indra/llcharacter')

diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp
index 2a0df26384..8c02a25367 100755
--- a/indra/llcharacter/llbvhloader.cpp
+++ b/indra/llcharacter/llbvhloader.cpp
@@ -203,6 +203,7 @@ LLBVHLoader::LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &error
 LLBVHLoader::~LLBVHLoader()
 {
 	std::for_each(mJoints.begin(),mJoints.end(),DeletePointer());
+	mJoints.clear();
 }
 
 //------------------------------------------------------------------------
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();
 }
 
 //-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/llmultigesture.cpp b/indra/llcharacter/llmultigesture.cpp
index e2d284834f..411bb094fd 100755
--- a/indra/llcharacter/llmultigesture.cpp
+++ b/indra/llcharacter/llmultigesture.cpp
@@ -59,6 +59,7 @@ LLMultiGesture::LLMultiGesture()
 LLMultiGesture::~LLMultiGesture()
 {
 	std::for_each(mSteps.begin(), mSteps.end(), DeletePointer());
+	mSteps.clear();
 }
 
 void LLMultiGesture::reset()
-- 
cgit v1.2.3


From 38915f119c5bf3d85084b12939ad815f68fefad0 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Fri, 14 Feb 2014 14:57:08 -0800
Subject: More memory cleanup of containers after DeletePairedPointer() usage.

---
 indra/llcharacter/llpose.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llcharacter')

diff --git a/indra/llcharacter/llpose.cpp b/indra/llcharacter/llpose.cpp
index 55e1b6e9ea..b1a7ebb159 100755
--- a/indra/llcharacter/llpose.cpp
+++ b/indra/llcharacter/llpose.cpp
@@ -461,6 +461,7 @@ LLPoseBlender::LLPoseBlender()
 LLPoseBlender::~LLPoseBlender()
 {
 	for_each(mJointStateBlenderPool.begin(), mJointStateBlenderPool.end(), DeletePairedPointer());
+	mJointStateBlenderPool.clear();
 }
 
 //-----------------------------------------------------------------------------
-- 
cgit v1.2.3