diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2013-01-10 05:06:11 +0000 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2013-01-10 05:06:11 +0000 |
| commit | 27bec2b2f21f19a7c04707b03f83c8caa855872d (patch) | |
| tree | 65c5e17cc7778e0d540b217889bfd47177f80df4 /indra/newview | |
| parent | 90b5937c74f6712dfee1e90568d174a1aaca5ed7 (diff) | |
yet more gcc fixes
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfasttimerview.cpp | 6 |
1 files 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<LLUnits::Seconds, F64>(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(); |