diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-11-15 12:05:05 -0800 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-11-15 12:05:05 -0800 |
commit | 5bfa6095db3a0a9c7367b7dde3f2e24e023cb7f4 (patch) | |
tree | 1ab6b0946d7bfb881a2ccfaa2382d24b46a6b729 /indra/llcommon/llfasttimer_class.cpp | |
parent | 65d847de38614a67ed1bdd86445c1c80f4638cc3 (diff) | |
parent | c13f6afe73bea4311a91d65dde2f6e1c5bc453b3 (diff) |
Added viewer-release.release-viewer.jira parameter to write build comment to DRTVWR-13
Diffstat (limited to 'indra/llcommon/llfasttimer_class.cpp')
-rw-r--r-- | indra/llcommon/llfasttimer_class.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index bc1ae37c2b..c45921cdec 100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp @@ -469,9 +469,9 @@ void LLFastTimer::NamedTimer::accumulateTimings() int hidx = cur_frame % HISTORY_NUM; timerp->mCountHistory[hidx] = timerp->mTotalTimeCounter; - timerp->mCountAverage = (timerp->mCountAverage * cur_frame + timerp->mTotalTimeCounter) / (cur_frame+1); + timerp->mCountAverage = ((U64)timerp->mCountAverage * cur_frame + timerp->mTotalTimeCounter) / (cur_frame+1); timerp->mCallHistory[hidx] = timerp->getFrameState().mCalls; - timerp->mCallAverage = (timerp->mCallAverage * cur_frame + timerp->getFrameState().mCalls) / (cur_frame+1); + timerp->mCallAverage = ((U64)timerp->mCallAverage * cur_frame + timerp->getFrameState().mCalls) / (cur_frame+1); } } } |