Fixed signed/unsigned warnings after they got enabled in the maint-A merge

1 files changed, 6 insertions, 4 deletions

diff --git a/indra/newview/llheroprobemanager.cpp b/indra/newview/llheroprobemanager.cpp
index 83c7b8a354..f544b70329 100644
--- a/indra/newview/llheroprobemanager.cpp
+++ b/indra/newview/llheroprobemanager.cpp
@@ -101,7 +101,7 @@ void LLHeroProbeManager::update()
         U32 count = log2((F32)res) + 0.5f;
 
         mMipChain.resize(count);
-        for (int i = 0; i < count; ++i)
+        for (U32 i = 0; i < count; ++i)
         {
             mMipChain[i].allocate(res, res, GL_RGBA16F);
             res /= 2;
@@ -198,7 +198,7 @@ void LLHeroProbeManager::update()
                 mFaceUpdateList[i] = ceilf(cube_facing * gPipeline.RenderHeroProbeConservativeUpdateMultiplier);
                 }
 
-            
+
             mProbes[0]->mOrigin = probe_pos;
         }
         else
@@ -359,7 +359,8 @@ void LLHeroProbeManager::updateProbeFace(LLReflectionMap* probe, U32 face, bool
 
             res /= 2;
 
-            S32 mip = i - (mMipChain.size() - mips);
+            llassert(mMipChain.size() <= size_t(S32_MAX));
+            GLint mip = i - (S32(mMipChain.size()) - mips);
 
             if (mip >= 0)
             {
@@ -487,7 +488,8 @@ void LLHeroProbeManager::updateUniforms()
         mHeroData.heroSphere.mV[3] = mProbes[0]->mRadius;
     }
 
-    mHeroData.heroMipCount = mMipChain.size();
+    llassert(mMipChain.size() <= size_t(S32_MAX));
+    mHeroData.heroMipCount = S32(mMipChain.size());
 }
 
 void LLHeroProbeManager::renderDebug()