summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llmodel.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-17 17:32:28 -0400
committerOz Linden <oz@lindenlab.com>2011-06-17 17:32:28 -0400
commit068c6d45099411d7827db3e50d9c91331fa5c189 (patch)
treec46cce78e6db0d87c1d9b0da9229ea0cf1d727de /indra/llprimitive/llmodel.h
parent5e5be51edebf0fb6a59d4907c9fcaac1b1667ac4 (diff)
parent806b11c5720e1bd9e9764fcfd896436b8385e8b2 (diff)
merge mesh branch changes (storm-1390)
Diffstat (limited to 'indra/llprimitive/llmodel.h')
-rw-r--r--indra/llprimitive/llmodel.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index 23f4b5cb42..cd9f76fcb7 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -73,6 +73,7 @@ public:
{
NO_ERRORS = 0,
VERTEX_NUMBER_OVERFLOW, //vertex number is >= 65535.
+ BAD_ELEMENT,
INVALID_STATUS
} ;
@@ -106,6 +107,7 @@ public:
Decomposition(LLSD& data);
void fromLLSD(LLSD& data);
LLSD asLLSD() const;
+ bool hasHullList() const;
void merge(const Decomposition* rhs);