summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llmodel.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-05-24 17:37:21 -0600
committerXiaohong Bao <bao@lindenlab.com>2011-05-24 17:37:21 -0600
commitcb797532c0bd7ca0ab4caf66c48aa55ec99160a0 (patch)
tree1c5d90dcb2dfd93cc03acf2d2156c0ddaed3340b /indra/llprimitive/llmodel.h
parent79131e8a480ab3611ce739717ed84c6ad76aa234 (diff)
parentf5726a094db77ec4fbba67e33d436cba8bf60a4b (diff)
Automated merge with http://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra/llprimitive/llmodel.h')
-rw-r--r--indra/llprimitive/llmodel.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index 23f4b5cb42..ebca1f9d9d 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -106,6 +106,7 @@ public:
Decomposition(LLSD& data);
void fromLLSD(LLSD& data);
LLSD asLLSD() const;
+ bool hasHullList() const;
void merge(const Decomposition* rhs);