livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yet more gcc fixes

master
Andrew Meadows 2013-01-10 05:06:11 +00:00
parent 90b5937c74
commit 27bec2b2f2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfasttimerview.cpp
View File

@ -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();