diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-01 23:55:06 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-01 23:55:06 -0500 |
| commit | c8ea9476ada163c62319d7949a5fd57aaa7fb09f (patch) | |
| tree | 64f7b7468cddd3bcacb14403fe57380f2b81b510 /indra/newview/llmeshrepository.h | |
| parent | 6992dbc1e32e1d8b803291aa1b87862fd6640c2a (diff) | |
| parent | d78ecc6c283cfee568a08d739bc6f5eec3b9828f (diff) | |
merge
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 0a6954bade..9b80fc02b3 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -475,7 +475,7 @@ public: static S32 getActualMeshLOD(LLSD& header, S32 lod); U32 calcResourceCost(LLSD& header); U32 getResourceCost(const LLUUID& mesh_params); - const LLMeshSkinInfo* getSkinInfo(const LLUUID& mesh_id); + const LLMeshSkinInfo* getSkinInfo(const LLUUID& mesh_id, LLVOVolume* requesting_obj); LLModel::Decomposition* getDecomposition(const LLUUID& mesh_id); void fetchPhysicsShape(const LLUUID& mesh_id); bool hasPhysicsShape(const LLUUID& mesh_id); @@ -504,7 +504,8 @@ public: std::vector<LLMeshRepoThread::LODRequest> mPendingRequests; //list of mesh ids awaiting skin info - std::set<LLUUID> mLoadingSkins; + typedef std::map<LLUUID, std::set<LLUUID> > skin_load_map; + skin_load_map mLoadingSkins; //list of mesh ids that need to send skin info fetch requests std::queue<LLUUID> mPendingSkinRequests; |