summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-06-15 16:28:12 -0600
committerXiaohong Bao <bao@lindenlab.com>2011-06-15 16:28:12 -0600
commit47b9f588df1f90126aa630ed050e41b2d145a085 (patch)
tree8aaba6284823715d93158912d7371105fee353b4 /indra/llprimitive
parent8e532652ebe02d479271d7ec6f2b7c293e020afe (diff)
parent0bb7bcc96cfea7b5d56f083d0afcbc1fce7e9f21 (diff)
Automated merge with http://hg.secondlife.com/mesh-development
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())
{