diff options
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rwxr-xr-x | indra/newview/llviewerobjectlist.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index e8f68527e9..214d4f2bf6 100755 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -999,9 +999,10 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world) // Time _can_ go backwards, for example if the user changes the system clock. // It doesn't cause any fatal problems (just some oddness with stats), so we shouldn't assert here. // llassert(time > gFrameTime); - LLUnit<F64, LLUnits::Seconds> time_diff = time - gFrameTime; + const F64 SEC_TO_MICROSEC = 1000000.f; + F64 time_diff = U64_to_F64(time - gFrameTime)/SEC_TO_MICROSEC; gFrameTime = time; - LLUnit<F64, LLUnits::Seconds> time_since_start = gFrameTime - gStartTime; + F64 time_since_start = U64_to_F64(gFrameTime - gStartTime)/SEC_TO_MICROSEC; gFrameTimeSeconds = time_since_start; gFrameIntervalSeconds = gFrameTimeSeconds - last_time; |