summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterobjectweights.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterobjectweights.cpp')
-rw-r--r--indra/newview/llfloaterobjectweights.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterobjectweights.cpp b/indra/newview/llfloaterobjectweights.cpp
index 8e102ab3b2..45adb77c71 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");
@@ -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());
}
}