summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-08-13 17:58:01 -0400
committerOz Linden <oz@lindenlab.com>2014-08-13 17:58:01 -0400
commit383edf8015743becc37650ab018a112b9ff347b1 (patch)
tree1e9a33f1517c6fff3416f5426de525628f1d29c2 /indra/llprimitive
parentd56958e68934e673195ec2966e0a3c20dac7fb41 (diff)
parent06b605b8666f2336e77126f8ff47765115c08a27 (diff)
merge changes for MAINT-4356
Diffstat (limited to 'indra/llprimitive')
-rwxr-xr-xindra/llprimitive/llmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 57a698b98f..b4963225dc 100755
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -191,7 +191,7 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa
U32 tc_count = tc_source ? tc.getCount() : 0;
U32 norm_count = norm_source ? n.getCount() : 0;
- if (vertex_count == 0)
+ if ((vertex_count == 0) || (tc_count == 0))
{
llwarns << "Unable to process mesh with empty position array; invalid model." << llendl;
return LLModel::BAD_ELEMENT;