Merge pull request #2856 from secondlife/marchcat/c-develop

Develop → Maint C sync

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfloaterobjectweights.cpp b/indra/newview/llfloaterobjectweights.cpp
index 8e102ab3b2..21aaed14c8 100644
--- a/indra/newview/llfloaterobjectweights.cpp
+++ b/indra/newview/llfloaterobjectweights.cpp
@@ -95,7 +95,7 @@ LLFloaterObjectWeights::~LLFloaterObjectWeights()
 }
 
 // virtual
-BOOL LLFloaterObjectWeights::postBuild()
+bool LLFloaterObjectWeights::postBuild()
 {
     mSelectedObjects = getChild<LLTextBox>("objects");
     mSelectedPrims = getChild<LLTextBox>("prims");
@@ -114,7 +114,7 @@ BOOL LLFloaterObjectWeights::postBuild()
     mTrianglesShown = getChild<LLTextBox>("triangles_shown");
     mPixelArea = getChild<LLTextBox>("pixel_area");
 
-    return TRUE;
+    return true;
 }
 
 // virtual
@@ -188,7 +188,7 @@ void LLFloaterObjectWeights::draw()
             if (object->isRootEdit())
             {
                 total_tris += object->recursiveGetTriangleCount();
-                pixel_area += object->getPixelArea();
+                pixel_area += static_cast<S32>(object->getPixelArea());
             }
         }