diff options
author | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
commit | 13de92740e55e8ba5111e1cd16e239ebeda3a578 (patch) | |
tree | 5da5b829085d2a19422ce1f2f987b395080369cc /indra/llprimitive/llmodel.h | |
parent | ab431d1774d5b282836a3327dd0bfa8b3b91632b (diff) | |
parent | 9a2e35f7cab1ba119e9887cd307f021fc6ae0bd5 (diff) |
merge latest viewer-development
Diffstat (limited to 'indra/llprimitive/llmodel.h')
-rw-r--r-- | indra/llprimitive/llmodel.h | 2 |
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); |