diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-22 12:49:54 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-22 12:49:54 -0500 |
| commit | 8de11e98cc198442f52c6950ed518a36ce8dbc8d (patch) | |
| tree | 0c8fdad6b28849508bea414e350e5cba2d338ab1 /indra/llprimitive/llmodel.h | |
| parent | aba13fb96c048fedf62b492b0db5ca0b185ce0a8 (diff) | |
| parent | 693b838b721c9d9405eda993cf2df38d9ed6e545 (diff) | |
Automated merge from mesh-development
Diffstat (limited to 'indra/llprimitive/llmodel.h')
| -rwxr-xr-x | indra/llprimitive/llmodel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index 9cc734ff59..ebf37904d4 100755 --- a/indra/llprimitive/llmodel.h +++ b/indra/llprimitive/llmodel.h @@ -56,6 +56,8 @@ public: typedef std::vector<LLVector3> hull; LLModel(LLVolumeParams& params, F32 detail); + ~LLModel(); + static LLSD writeModel( std::string filename, LLModel* physics, @@ -193,6 +195,7 @@ public: LLVector3 mNormalizedTranslation; // convex hull decomposition + S32 mDecompID; convex_hull_decomposition mConvexHullDecomp; void setConvexHullDecomposition( const convex_hull_decomposition& decomp); |