diff options
| author | Richard Linden <none@none> | 2014-01-09 12:22:24 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-01-09 12:22:24 -0800 |
| commit | 15e6939342956f830996299352bcf7fffa7c3b85 (patch) | |
| tree | dcd6443f049d35b3f3401d768b1eab735eda363b /indra/llcommon/llframetimer.h | |
| parent | d8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff) | |
| parent | 1d0d485b69bbbfd63d2d56a795d818131db2667c (diff) | |
merge with release
Diffstat (limited to 'indra/llcommon/llframetimer.h')
| -rwxr-xr-x | indra/llcommon/llframetimer.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcommon/llframetimer.h b/indra/llcommon/llframetimer.h index 45754f3785..81bd5da8a3 100755 --- a/indra/llcommon/llframetimer.h +++ b/indra/llcommon/llframetimer.h @@ -35,7 +35,6 @@ */ #include "lltimer.h" -#include "timing.h" class LL_COMMON_API LLFrameTimer { @@ -44,7 +43,7 @@ public: // Return the number of seconds since the start of this // application instance. - static F64 getElapsedSeconds() + static F64SecondsImplicit getElapsedSeconds() { // Loses msec precision after ~4.5 hours... return sFrameTime; @@ -53,7 +52,7 @@ public: // Return a low precision usec since epoch static U64 getTotalTime() { - return sTotalTime ? sTotalTime : totalTime(); + return sTotalTime ? U64MicrosecondsImplicit(sTotalTime) : totalTime(); } // Return a low precision seconds since epoch |