summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2011-06-06 15:36:24 -0700
committerRoxie Linden <roxie@lindenlab.com>2011-06-06 15:36:24 -0700
commit86d6c3f196af3f40bcd4fc62c7828476c7a9d037 (patch)
treebb0fa42f4e83859bce318810b0a14e4de0970ae1
parentc24a5a3fb5e24ffe3faddb5c71e884d9a1513db0 (diff)
parent5f2f532aaa7af094a1dd6e5ebcd9f51ac1941047 (diff)
automated merge
-rw-r--r--indra/llprimitive/llmodel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 5acf93cfc4..337fa59f76 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -1419,8 +1419,9 @@ LLSD LLModel::writeModel(
for (S32 i = 0; i < model[idx]->getNumVolumeFaces(); ++i)
{ //for each face
const LLVolumeFace& face = model[idx]->getVolumeFace(i);
- if (!face.mNumVertices)
+ if (face.mNumVertices < 3)
{ //don't export an empty face
+ mdl[model_names[idx]][i]["NoGeometry"] = true;
continue;
}
LLSD::Binary verts(face.mNumVertices*3*2);