summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-04-19 12:37:27 -0500
committerDave Parks <davep@lindenlab.com>2011-04-19 12:37:27 -0500
commit12b0b52b99e6f6a6538feba8589566d2f73f82c6 (patch)
treeb4053044a9d9f95aa7fea445ce8873ae744f74b1 /indra/llprimitive
parent3cb97cb4d75c40d9519d796dd52d0741d354fc97 (diff)
parentc494e5c0d55b2da2f5aa5ea18fbccb670b2f3107 (diff)
merge
Diffstat (limited to 'indra/llprimitive')
-rwxr-xr-xindra/llprimitive/llmodel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 03b893de29..5af1122451 100755
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -2067,7 +2067,7 @@ void LLModel::Decomposition::fromLLSD(LLSD& decomp)
std::set<U64> valid;
//must have at least 4 points
- llassert(count > 3);
+ //llassert(count > 3);
for (U32 j = 0; j < count; ++j)
{
@@ -2085,7 +2085,7 @@ void LLModel::Decomposition::fromLLSD(LLSD& decomp)
}
//each hull must contain at least 4 unique points
- llassert(valid.size() > 3);
+ //llassert(valid.size() > 3);
}
}