diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-10 00:18:04 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-10 00:18:04 -0500 |
| commit | 97ba99b3c04904633ec3e52f69602a11343e8b4c (patch) | |
| tree | 3c73eef563362a557494a0362772ca0537a9d752 /indra/newview/llmeshrepository.h | |
| parent | 782c8a48f1dd56db7c2e5546291d15b78741d455 (diff) | |
| parent | 33cf789134a941308158853bec1d21737c323eb3 (diff) | |
merge
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rwxr-xr-x | indra/newview/llmeshrepository.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index d775e8f74a..a15650463e 100755 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -231,8 +231,7 @@ public: mesh_header_map mMeshHeader; std::map<LLUUID, U32> mMeshHeaderSize; - std::map<LLUUID, U32> mMeshResourceCost; - + class HeaderRequest { public: @@ -335,8 +334,7 @@ public: void notifyLoadedMeshes(); S32 getActualMeshLOD(const LLVolumeParams& mesh_params, S32 lod); - U32 getResourceCost(const LLUUID& mesh_params); - + void loadMeshSkinInfo(const LLUUID& mesh_id); void loadMeshDecomposition(const LLUUID& mesh_id); void loadMeshPhysicsShape(const LLUUID& mesh_id); @@ -466,8 +464,6 @@ public: S32 getActualMeshLOD(const LLVolumeParams& mesh_params, S32 lod); static S32 getActualMeshLOD(LLSD& header, S32 lod); - U32 calcResourceCost(LLSD& header); - U32 getResourceCost(const LLUUID& mesh_params); const LLMeshSkinInfo* getSkinInfo(const LLUUID& mesh_id, LLVOVolume* requesting_obj); LLModel::Decomposition* getDecomposition(const LLUUID& mesh_id); void fetchPhysicsShape(const LLUUID& mesh_id); |