diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-06 16:35:46 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-06 16:35:46 -0600 |
| commit | ddef4d7ff74ecff49e76afca58d1d3c2486e8af3 (patch) | |
| tree | d668ebf925b26e87b906e654d8716dc7df731cdd /indra/newview/llstartup.cpp | |
| parent | 576b9339977f50edb11a799d7a274610263f9fdc (diff) | |
revert some LLUnit changes to temporarily fix SH-4399: Interesting: Texture console MB Bound 0/384 and texture queue bounces once per second
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 933cc74064..b1ff047233 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1429,8 +1429,9 @@ bool idle_startup() LL_DEBUGS("AppInit") << "Initializing camera..." << LL_ENDL; gFrameTime = totalTime(); - LLUnit<F32, LLUnits::Seconds> last_time = gFrameTimeSeconds; - gFrameTimeSeconds = (gFrameTime - gStartTime); + F32 last_time = gFrameTimeSeconds; + const F64 SEC_TO_MICROSEC = 1000000.f; + gFrameTimeSeconds = (F32)((gFrameTime - gStartTime) / SEC_TO_MICROSEC); gFrameIntervalSeconds = gFrameTimeSeconds - last_time; if (gFrameIntervalSeconds < 0.f) |