diff options
| author | Richard Linden <none@none> | 2013-06-17 01:20:27 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-17 01:20:27 -0700 |
| commit | 1cb0c974ae410479a1f72dab556ef7c9371970ee (patch) | |
| tree | 91a97b4b05e8085fdad17173b7ca874bb98a8805 /indra/newview/llappviewer.h | |
| parent | fc88265cffe3553803314c6e895a1e3a3c988171 (diff) | |
| parent | 3f2de87340b1c831ea59e4a3ca960d49f343c9fd (diff) | |
Merge
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rwxr-xr-x | indra/newview/llappviewer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 2e75de445f..ad662d8ea1 100755 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -337,7 +337,7 @@ extern LLPumpIO* gServicePump; extern U64 gFrameTime; // The timestamp of the most-recently-processed frame extern F32 gFrameTimeSeconds; // Loses msec precision after ~4.5 hours... -extern LLUnit<LLUnits::Seconds, F32> gFrameIntervalSeconds; // Elapsed time between current and previous gFrameTimeSeconds +extern LLUnit<F32, LLUnits::Seconds> gFrameIntervalSeconds; // Elapsed time between current and previous gFrameTimeSeconds extern F32 gFPSClamped; // Frames per second, smoothed, weighted toward last frame extern F32 gFrameDTClamped; extern U64 gStartTime; |