From 7b44a8ee8de662355c8f5c8091ab25dccce494e5 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 22 Sep 2010 15:58:35 -0500
Subject: SH-110 Fix for viewer crash when checking HULL in decomposition
 window... converted various maps to use smart pointers for keys instead of
 naked pointers, properly clear maps on various operations.

---
 indra/newview/llfloatermodelpreview.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llfloatermodelpreview.h')

diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 148687aecd..d8f06295ac 100755
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -168,12 +168,12 @@ class LLModelPreview : public LLViewerDynamicTexture, public LLMutex
 	LLModelLoader::model_list mModel[LLModel::NUM_LODS];
 	LLModelLoader::model_list mBaseModel;
 
-	std::map<LLModel*, U32> mGroup;
-	std::map<LLModel*, U32> mObject;
-	std::map<LLModel*, std::vector<U32> > mPatch;
+	std::map<LLPointer<LLModel>, U32> mGroup;
+	std::map<LLPointer<LLModel>, U32> mObject;
+	std::map<LLPointer<LLModel>, std::vector<U32> > mPatch;
+	std::map<LLPointer<LLModel>, F32> mPercentage;
 
-	std::map<LLModel*, F32> mPercentage;
-	std::map<LLModel*, std::vector<LLPointer<LLVertexBuffer> > > mPhysicsMesh;
+	std::map<LLPointer<LLModel>, std::vector<LLPointer<LLVertexBuffer> > > mPhysicsMesh;
 
 	LLMeshUploadThread::instance_list mUploadData;
 	std::set<LLPointer<LLViewerFetchedTexture> > mTextureSet;
-- 
cgit v1.2.3