From e298325bed05f0f37fd134b72c68cce186475f23 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 23 Sep 2014 19:12:35 -0700 Subject: MAINT-4481 FIX [viewer-lion] Linux build fails due array-bounds issue in llmanipscale.cpp This was an out of bounds array access on a code path not normally accessed To test, set debug setting ScaleShowAxes to true, go into build mode, and hold down Ctrl+Shift to scale an object There should be colored bars along the scale axes, limited to the bounds of the object's extents --- indra/llprimitive/llmodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llprimitive') 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& 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& 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; } -- cgit v1.2.3