summaryrefslogtreecommitdiff
path: root/indra/newview/llmeshrepository.h
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2011-06-03 14:34:00 -0700
committerRoxie Linden <roxie@lindenlab.com>2011-06-03 14:34:00 -0700
commitbc014c2e9e17a97c4dc5e0f9cb19654cad4b8980 (patch)
tree9ad50a74079b8f571c8f873ae2de1eec16474e5b /indra/newview/llmeshrepository.h
parentf4722b39059147088b9008736370b407daec5d91 (diff)
parent31e850d04885bed2ac779c66bb6b7923a0a51d96 (diff)
automated merge
Diffstat (limited to 'indra/newview/llmeshrepository.h')
-rw-r--r--indra/newview/llmeshrepository.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 9b80fc02b3..ba64387dbb 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -482,6 +482,10 @@ public:
void buildHull(const LLVolumeParams& params, S32 detail);
void buildPhysicsMesh(LLModel::Decomposition& decomp);
+
+ bool meshUploadEnabled();
+ bool meshRezEnabled();
+
LLSD& getMeshHeader(const LLUUID& mesh_id);