summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llmodel.h
diff options
context:
space:
mode:
authorsimon@lindenlab.com <simon@lindenlab.com>2011-06-21 09:36:31 -0700
committersimon@lindenlab.com <simon@lindenlab.com>2011-06-21 09:36:31 -0700
commitd11cabc4898a7a1995ed7c89d2cdac46dfcf24ec (patch)
tree9f8e5e57d4ed074e148227c56556bcace90e2e3a /indra/llprimitive/llmodel.h
parentc0c0a2b9a5f41fc06619330a81c34955a39ddfe2 (diff)
parentede3b577d8cebd5065514bb485e2cbd93dd5b05a (diff)
Merge with latest lindenlab/viewer-development
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);