diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-12-09 22:00:01 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-12-09 22:00:01 -0800 |
| commit | 52686947e2643eaa0f1cda03f33bbf1089d3b46d (patch) | |
| tree | 0ac1953df5a44fde129ead1f5d7c3e91eea4bc90 /indra/newview/llmeshrepository.h | |
| parent | db1af2445dac667eb24c69d005509b8ff007cc9e (diff) | |
| parent | d8695e8d657568d0ebf6b63ad9cadad7e225afc7 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index df00c6c7aa..8687ac750b 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -458,7 +458,8 @@ public: const LLMeshSkinInfo* getSkinInfo(const LLUUID& mesh_id); const LLMeshDecomposition* getDecomposition(const LLUUID& mesh_id); void fetchPhysicsShape(const LLUUID& mesh_id); - + bool hasPhysicsShape(const LLUUID& mesh_id); + void buildHull(const LLVolumeParams& params, S32 detail); const LLSD& getMeshHeader(const LLUUID& mesh_id); |