diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 17:11:17 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 17:11:17 -0400 |
commit | 8897e7ca24533e0093825346391f5fa9a37f2427 (patch) | |
tree | 781b08a7a90e53124d4f11b507be4d726544f0f0 /indra/llprimitive | |
parent | 79ab7c20703c092a4416a4f9a885e0246fc17ee0 (diff) | |
parent | 499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff) |
Merge. Refresh from viewer-release after 3.7.16 release.
Diffstat (limited to 'indra/llprimitive')
-rwxr-xr-x | indra/llprimitive/llmodel.cpp | 2 |
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; |