diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-01 11:00:08 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-01 11:00:08 -0400 |
| commit | ce3e83270606b064afbe77d8f8a8d268cfa3772a (patch) | |
| tree | 87275407e8cadc8adbc147b6a06a289bf896ad9f /indra/newview/llmeshrepository.h | |
| parent | af3f9004ef486f9eed14eb65ee3c95d1e9a22917 (diff) | |
| parent | e3fec30097a28689a7022d06005d7d59a3004f0c (diff) | |
Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index d5e21c35cc..b26598ce31 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -405,8 +405,7 @@ public: void uploadModel(std::vector<LLModelInstance>& data, LLVector3& scale, bool upload_textures); - - + S32 getMeshSize(const LLUUID& mesh_id, S32 lod); typedef std::map<LLVolumeParams, std::set<LLUUID> > mesh_load_map; mesh_load_map mLoadingMeshes[4]; |