summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-06-16 15:58:55 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-06-16 15:58:55 -0400
commit8114464a729ef54b850a91f3677d78304e9c5648 (patch)
treef1054041c54a82e0bcc5be73599d1badda21b8b6 /indra/llprimitive
parentcc6e80412949639f52138adde5b909a298cd2242 (diff)
parent9d9d9197a05935a544e585651e7895a366cc6cae (diff)
merge
Diffstat (limited to 'indra/llprimitive')
-rw-r--r--indra/llprimitive/llmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index e0cfa07614..0463d5364b 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -2252,7 +2252,7 @@ LLSD LLModel::Decomposition::asLLSD() const
ret["Positions"] = p;
}
- llassert(!mBaseHull.empty());
+ //llassert(!mBaseHull.empty());
if (!mBaseHull.empty())
{