diff options
| author | richard <none@none> | 2010-01-04 13:05:50 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-01-04 13:05:50 -0800 |
| commit | 659995ce0b1aba06842d0ade4b47028491cd2c5f (patch) | |
| tree | 9ddf02100c15747cb178e5ed3d367be035ba45d1 /indra/newview | |
| parent | 6157187e5bdff889613673f11852d9c25f96bf92 (diff) | |
| parent | 02262a60ad233ff06f8d3f975a240660c317c903 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfasttimerview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index effa57b1ef..7d8bb6e104 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -323,7 +323,9 @@ void LLFastTimerView::draw() S32 xleft = margin; S32 ytop = margin; - mAverageCyclesPerTimer = llround(lerp((F32)mAverageCyclesPerTimer, (F32)(LLFastTimer::sTimerCycles / (U64)LLFastTimer::sTimerCalls), 0.1f)); + mAverageCyclesPerTimer = LLFastTimer::sTimerCalls == 0 + ? 0 + : llround(lerp((F32)mAverageCyclesPerTimer, (F32)(LLFastTimer::sTimerCycles / (U64)LLFastTimer::sTimerCalls), 0.1f)); LLFastTimer::sTimerCycles = 0; LLFastTimer::sTimerCalls = 0; |