diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-05 15:53:03 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-05 15:53:03 -0500 |
| commit | 6a3cb427071641585d9beb44c3e46a148f90a791 (patch) | |
| tree | dae00c85fc3515216a0b3bbace5a99eded542b5e /indra/llprimitive/llmodel.cpp | |
| parent | b811b22c4aad589d5428f9d5fa5b43c60840b039 (diff) | |
| parent | 6d48db868f7459fcf5f0e89d830a844e409d4163 (diff) | |
merge changes for 3.7.22-release
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rwxr-xr-x | indra/llprimitive/llmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index b4963225dc..b19df0200d 100755 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -172,7 +172,7 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa if (!pos_source) { - llwarns << "Unable to process mesh without position data; invalid model; invalid model." << llendl; + LL_WARNS() << "Unable to process mesh without position data; invalid model; invalid model." << LL_ENDL; return LLModel::BAD_ELEMENT; } @@ -193,7 +193,7 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa if ((vertex_count == 0) || (tc_count == 0)) { - llwarns << "Unable to process mesh with empty position array; invalid model." << llendl; + LL_WARNS() << "Unable to process mesh with empty position array; invalid model." << LL_ENDL; return LLModel::BAD_ELEMENT; } |