From ddef4d7ff74ecff49e76afca58d1d3c2486e8af3 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Tue, 6 Aug 2013 16:35:46 -0600 Subject: revert some LLUnit changes to temporarily fix SH-4399: Interesting: Texture console MB Bound 0/384 and texture queue bounces once per second --- indra/newview/llviewerobjectlist.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewerobjectlist.cpp') diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 4072ab524e..0b75d44096 100755 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1000,9 +1000,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 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 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; -- cgit v1.2.3