Pull merge from lindenlab/viewer-release

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index a3a8616864..63d01999f0 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -195,6 +195,7 @@ LLTexLayerSetInfo::LLTexLayerSetInfo() :
 LLTexLayerSetInfo::~LLTexLayerSetInfo( )
 {
 	std::for_each(mLayerInfoList.begin(), mLayerInfoList.end(), DeletePointer());
+	mLayerInfoList.clear();
 }
 
 BOOL LLTexLayerSetInfo::parseXml(LLXmlTreeNode* node)
@@ -282,7 +283,10 @@ LLTexLayerSet::~LLTexLayerSet()
 {
 	deleteCaches();
 	std::for_each(mLayerList.begin(), mLayerList.end(), DeletePointer());
+	mLayerList.clear();
+
 	std::for_each(mMaskLayerList.begin(), mMaskLayerList.end(), DeletePointer());
+	mMaskLayerList.clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -652,7 +656,9 @@ LLTexLayerInfo::LLTexLayerInfo() :
 LLTexLayerInfo::~LLTexLayerInfo( )
 {
 	std::for_each(mParamColorInfoList.begin(), mParamColorInfoList.end(), DeletePointer());
+	mParamColorInfoList.clear();
 	std::for_each(mParamAlphaInfoList.begin(), mParamAlphaInfoList.end(), DeletePointer());
+	mParamAlphaInfoList.clear();
 }
 
 BOOL LLTexLayerInfo::parseXml(LLXmlTreeNode* node)