summaryrefslogtreecommitdiff
path: root/indra/llcommon/llframetimer.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcommon/llframetimer.h')
-rwxr-xr-xindra/llcommon/llframetimer.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llframetimer.h b/indra/llcommon/llframetimer.h
index 45754f3785..d64009440c 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
{
@@ -53,7 +52,7 @@ public:
// Return a low precision usec since epoch
static U64 getTotalTime()
{
- return sTotalTime ? sTotalTime : totalTime();
+ return sTotalTime ? LLUnitImplicit<U64, LLUnits::Microseconds>(sTotalTime) : totalTime();
}
// Return a low precision seconds since epoch