From 27bec2b2f21f19a7c04707b03f83c8caa855872d Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 10 Jan 2013 05:06:11 +0000 Subject: yet more gcc fixes --- indra/newview/llfasttimerview.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 6409767285..32ed662548 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -514,7 +514,7 @@ void LLFastTimerView::draw() else { ms = LLUnit(frame_recording.getPeriodMean(*idp)); - calls = frame_recording.getPeriodMean((F32)idp->callCount()); + calls = (S32)frame_recording.getPeriodMean((F32)idp->callCount()); } if (mDisplayCalls) @@ -728,7 +728,7 @@ void LLFastTimerView::draw() } else if (prev_id && get_depth(prev_id) < get_depth(idp)) { - U64 sublevelticks = 0; + F64 sublevelticks = 0; for (TimeBlock::child_const_iter it = prev_id->beginChildren(); it != prev_id->endChildren(); @@ -736,7 +736,7 @@ void LLFastTimerView::draw() { sublevelticks += (tidx == -1) ? frame_recording.getPeriodMean(**it).value() - : (U64)frame_recording.getPrevRecordingPeriod(tidx).getSum(**it).value(); + : frame_recording.getPrevRecordingPeriod(tidx).getSum(**it).value(); } F32 subfrac = (F32)sublevelticks / (F32)total_time.value(); -- cgit v1.2.3