Clean up some compiler warnings. More to come.

3 files changed, 11 insertions, 8 deletions

diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index 5ee3929..1cad593 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -535,6 +535,8 @@ void LLFont::renderGlyph(const U32 glyph_index) const
         int error = FT_Load_Glyph(mFTFace, glyph_index, FT_LOAD_DEFAULT );
         llassert(!error);
 
+        // Work around the compiler warning about error not being used when llassert() is compiled out.
+        error = error + 0;
         error = FT_Render_Glyph(mFTFace->glyph, gFontRenderMode);
 
         mRenderGlyphCount++;
diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
index 4a4ff1b..b57a562 100644
--- a/linden/indra/llrender/llgl.cpp
+++ b/linden/indra/llrender/llgl.cpp
@@ -383,11 +383,10 @@ bool LLGLManager::initGL()
         if (mGLVendor.substr(0,4) == "ATI ")
         {
                 mGLVendorShort = "ATI";
-                BOOL mobile = FALSE;
-                if (mGLRenderer.find("MOBILITY") != std::string::npos)
-                {
-                        mobile = TRUE;
-                }
+                // This is not used anywhere.
+                //BOOL mobile = FALSE;
+                //if (mGLRenderer.find("MOBILITY") != std::string::npos)
+                //      mobile = TRUE;
                 mIsATI = TRUE;
 
 #if LL_WINDOWS && !LL_MESA_HEADLESS
@@ -1014,8 +1013,8 @@ void assert_glerror()
 void clear_glerror()
 {
         //  Create or update texture to be used with this data 
-        GLenum error;
-        error = glGetError();
+        //GLenum error;
+        /*error =*/ glGetError();
 }
 
 ///////////////////////////////////////////////////////////////
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index c63d7ad..f99d4a9 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -711,7 +711,9 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
                                         {
                                                 S32 bytes = w * h * mComponents;
                                                 llassert(prev_mip_data);
-                                                llassert(prev_mip_size == bytes*4);
+                                                llassert(prev_mip_size == (bytes*4));
+                                                // Work around llassert() being compiled out and prev_mip_size not otherwise being used.
+                                                prev_mip_size = prev_mip_size + 0;
                                                 U8* new_data = new U8[bytes];
                                                 llassert_always(new_data);
                                                 LLImageBase::generateMip(prev_mip_data, new_data, w, h, mComponents);