summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llmodel.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-29 14:08:47 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-29 14:08:47 -0500
commit93ee0b044f77ab07bb9df08bf52c9f4afa713caa (patch)
tree08490033f3628dadb0073bf2b07d5e7af0ec1798 /indra/llprimitive/llmodel.h
parent28b628ab7b92243a6e40fcdf87f4e2c5b44150e7 (diff)
parent8204145ab1c4b8f8a509db15f61bbdd264532508 (diff)
merge
Diffstat (limited to 'indra/llprimitive/llmodel.h')
-rwxr-xr-xindra/llprimitive/llmodel.h3
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);