diff options
| author | Richard Linden <none@none> | 2013-08-12 20:08:18 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-12 20:08:18 -0700 |
| commit | b39cf4770b6d73de51b0ed451139bb4502f396c8 (patch) | |
| tree | 2bc7ee5889f619a86575e5b47d8e5dca42e98442 /indra/newview/llstartup.cpp | |
| parent | b8d49dab9afddf196618d66b1a409cdf7d2d53ba (diff) | |
Backed out changeset: ed09997b4652
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index ae8afd0eae..3335ff6631 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1429,9 +1429,8 @@ bool idle_startup() LL_DEBUGS("AppInit") << "Initializing camera..." << LL_ENDL; gFrameTime = totalTime(); - F32 last_time = gFrameTimeSeconds; - const F64 SEC_TO_MICROSEC = 1000000.f; - gFrameTimeSeconds = (F32)((gFrameTime - gStartTime) / SEC_TO_MICROSEC); + LLUnit<F32, LLUnits::Seconds> last_time = gFrameTimeSeconds; + gFrameTimeSeconds = (gFrameTime - gStartTime); gFrameIntervalSeconds = gFrameTimeSeconds - last_time; if (gFrameIntervalSeconds < 0.f) |