diff options
Diffstat (limited to 'indra/newview/llfasttimerview.cpp')
| -rw-r--r-- | indra/newview/llfasttimerview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 56e5710726..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(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(); @@ -934,7 +934,7 @@ void LLFastTimerView::draw() max_time = llmax(LLUnit<LLUnits::Microseconds, F32>(1), LLUnit<LLUnits::Microseconds, F32>(cur_max)); } - max_calls = lerp((F32)max_calls, (F32) cur_max_calls, LLCriticalDamp::getInterpolant(0.1f)); + max_calls = llround(lerp((F32)max_calls, (F32) cur_max_calls, LLCriticalDamp::getInterpolant(0.1f))); if (llabs((S32)(max_calls - cur_max_calls)) <= 1) { max_calls = cur_max_calls; @@ -1011,7 +1011,7 @@ void LLFastTimerView::draw() } LLUnit<LLUnits::Milliseconds, F32> ms = ticks; - timer_stat += llformat("%.1f",ms); + timer_stat += llformat("%.1f",ms.value()); if (idp->getCollapsed()) { |