From 840540be186904b1e711d79dede0c771c967950c Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 10 Jan 2013 18:42:39 -0800
Subject: [PATCH] SH-3405 WIP convert existing stats to lltrace system fixed
gcc errors in llscenemonitor.cpp
---
indra/newview/llscenemonitor.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp
index 4872200f249..189697dcf01 100644
--- a/indra/newview/llscenemonitor.cpp
+++ b/indra/newview/llscenemonitor.cpp
@@ -346,7 +346,7 @@ void LLSceneMonitor::calcDiffAggregate()
glBeginQueryARB(GL_SAMPLES_PASSED_ARB, mQueryObject);
}
- gl_draw_scaled_target(0, 0, mDiff->getWidth() * mDiffPixelRatio, mDiff->getHeight() * mDiffPixelRatio, mDiff);
+ gl_draw_scaled_target(0, 0, S32(mDiff->getWidth() * mDiffPixelRatio), S32(mDiff->getHeight() * mDiffPixelRatio), mDiff);
if(mHasNewDiff)
{
@@ -424,8 +424,8 @@ void LLSceneMonitorView::draw()
}
F32 ratio = LLSceneMonitor::getInstance()->getDiffPixelRatio();
- S32 height = target->getHeight() * ratio;
- S32 width = target->getWidth() * ratio;
+ S32 height = (S32)(target->getHeight() * ratio);
+ S32 width = (S32)(target->getWidth() * ratio);
//S32 height = (S32) (gViewerWindow->getWindowRectScaled().getHeight()*0.5f);
//S32 width = (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.5f);
--
GitLab