From 75eb1e6ca6ccb501dba43ccdcaff5c500ca62170 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 18 Nov 2016 16:24:36 +0200 Subject: MAINT-6901 Linux build fix --- indra/llprimitive/llmodel.cpp | 2 +- indra/llprimitive/llmodel.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 3270722ccb..39ee550844 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -176,7 +176,7 @@ void LLModel::trimVolumeFacesToSize(U32 new_count, LLVolume::face_list_t* remain // Shrink group of models to fit // on a 1x1x1 cube centered at the origin. -void LLModel::normalizeModels(std::vector> model_list) +void LLModel::normalizeModels(std::vector > model_list) { std::vector >::iterator iter = model_list.begin(); diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index 8fe025a352..8f07058dbd 100644 --- a/indra/llprimitive/llmodel.h +++ b/indra/llprimitive/llmodel.h @@ -172,7 +172,7 @@ public: void addFace(const LLVolumeFace& face); void sortVolumeFacesByMaterialName(); - static void normalizeModels(std::vector> model_list); + static void normalizeModels(std::vector > model_list); void normalizeVolumeFaces(); void trimVolumeFacesToSize(U32 new_count = LL_SCULPT_MESH_MAX_FACES, LLVolume::face_list_t* remainder = NULL); void optimizeVolumeFaces(); -- cgit v1.2.3