diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-12-22 01:05:52 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-12-22 01:05:52 -0600 |
| commit | 171307ded9084b3045b7f447abc9662525fadc46 (patch) | |
| tree | 90a5d953dfcbb68652c464f7da94a3c83c747392 /indra/llprimitive/llmodel.h | |
| parent | ce595b5663065c5a4e0cc8cc7788965489bd7c04 (diff) | |
| parent | e1b1db9575945fa8436b4ebabf55242635b61f38 (diff) | |
merge
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); |