From eeb3a096d405df5d43deb057bc2eedba574c40bc Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Fri, 8 Jul 2016 16:46:34 -0400 Subject: [PATCH] Fix signed/unsigned mismatch --- indra/llprimitive/lldaeloader.cpp | 2 +- indra/llprimitive/llmodelloader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index 89ca130b6..378efa05a 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -2248,7 +2248,7 @@ LLImportMaterial LLDAELoader::profileToMaterial(domProfile_COMMON* material, DAE if (newparams.getCount()) { - for (S32 i = 0; i < newparams.getCount(); i++) + for (U32 i = 0; i < newparams.getCount(); i++) { domFx_surface_common* surface = newparams[i]->getSurface(); if (surface) diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp index 7859b5ee5..189447150 100644 --- a/indra/llprimitive/llmodelloader.cpp +++ b/indra/llprimitive/llmodelloader.cpp @@ -379,7 +379,7 @@ bool LLModelLoader::loadFromSLM(const std::string& filename) { if (!model[lod].empty()) { - if (idx >= model[lod].size()) + if (idx >= (S32)model[lod].size()) { if (model[lod].size()) {