diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-04 16:50:42 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-04 16:50:42 -0700 |
| commit | 4a29253a59140727334084768ebc7850d3d94eed (patch) | |
| tree | 9b177328f8db531db478109e02a11e4b3f5888e2 /indra/newview/llfloatermodelpreview.h | |
| parent | 8eda31456a0466cfa7674a881ebc69ea2abbf8a1 (diff) | |
| parent | f1b7fce1db6cd7a8f312216baaa8fada931b2579 (diff) | |
Automated merge with http://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index 11c2447da5..52ebec84d0 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -97,6 +97,7 @@ public: virtual void run(); + void loadTextures() ; //called in the main thread. void processElement(daeElement* element); std::vector<LLImportMaterial> getMaterials(LLModel* model, domInstance_geometry* instance_geo); LLImportMaterial profileToMaterial(domProfile_COMMON* material); @@ -325,7 +326,7 @@ class LLModelPreview : public LLViewerDynamicTexture, public LLMutex std::map<LLPointer<LLModel>, std::vector<LLPointer<LLVertexBuffer> > > mPhysicsMesh; LLMeshUploadThread::instance_list mUploadData; - std::set<LLPointer<LLViewerFetchedTexture> > mTextureSet; + std::set<LLViewerFetchedTexture* > mTextureSet; //map of vertex buffers to models (one vertex buffer in vector per face in model std::map<LLModel*, std::vector<LLPointer<LLVertexBuffer> > > mVertexBuffer[LLModel::NUM_LODS+1]; |