diff options
author | Merov Linden <merov@lindenlab.com> | 2014-09-28 21:40:32 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-09-28 21:40:32 -0700 |
commit | 4b80a5ed059d91bc37558db8ed664365e39d21d6 (patch) | |
tree | 55cfddc381448a72b54c03347deabada9687f629 /indra/llprimitive/llmodel.cpp | |
parent | 896f48229e577b1bcf94f2cb80d73a6bf1a9330c (diff) | |
parent | 499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff) |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
-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; |