diff options
author | Richard Linden <none@none> | 2013-01-10 18:42:39 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-01-10 18:42:39 -0800 |
commit | 840540be186904b1e711d79dede0c771c967950c (patch) | |
tree | 742459fc0448d78cfc40b31cbf99f318ad5287cb | |
parent | 832cfb3afe5c45304bf6296bc57aac9efa935b3d (diff) |
SH-3405 WIP convert existing stats to lltrace system
fixed gcc errors in llscenemonitor.cpp
-rw-r--r-- | indra/newview/llscenemonitor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index 4872200f24..189697dcf0 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); |