diff options
| author | Richard Linden <none@none> | 2013-08-14 16:10:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-14 16:10:17 -0700 |
| commit | bceb1e8abe916cd69e7ac6ab70dc03dc6d76c9df (patch) | |
| tree | 0016163049097d6b55a065b8fafdc609f1879c54 /indra/newview/llstartup.cpp | |
| parent | 52086d4485e004999d097cb66fb5cf63e34203d2 (diff) | |
| parent | 26581404e426b00cd0a07c38b5cb858d5d5faa28 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 3335ff6631..3a3731d519 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1429,7 +1429,7 @@ bool idle_startup() LL_DEBUGS("AppInit") << "Initializing camera..." << LL_ENDL; gFrameTime = totalTime(); - LLUnit<F32, LLUnits::Seconds> last_time = gFrameTimeSeconds; + LLUnits::F32Seconds last_time = gFrameTimeSeconds; gFrameTimeSeconds = (gFrameTime - gStartTime); gFrameIntervalSeconds = gFrameTimeSeconds - last_time; |