diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-09-23 15:44:17 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-09-23 15:44:17 -0400 |
| commit | ec88d21c561cd80415f6e47812dd4c3c4bd0b088 (patch) | |
| tree | 31085ce65d3c21782bf8b27d89a5e9277ebfc443 /indra/newview/llfloatermodelpreview.h | |
| parent | 0c505b83591213091b6662dfdcd39ef797578923 (diff) | |
| parent | ea2e53065bfe5c384b4c1bb53629a362bc90e1e9 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.h | 10 |
1 files changed, 5 insertions, 5 deletions
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; |