diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-22 15:59:00 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-22 15:59:00 -0500 |
| commit | a5fc11ea21ad8ac9bf6a4be97c16fe977db40175 (patch) | |
| tree | 3644c34d3732649f72a1ec94536f56663395b9b9 /indra/newview/llfloatermodelpreview.h | |
| parent | 6d8e9cd8bde57bd033beeb9610f7094c19655ed1 (diff) | |
| parent | 7b44a8ee8de662355c8f5c8091ab25dccce494e5 (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; |