summaryrefslogtreecommitdiff
path: root/indra/llcommon/llframetimer.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-07-30 19:50:37 -0700
committerRichard Linden <none@none>2013-07-30 19:50:37 -0700
commite8aa0c493b66dd414ef75ddb3fb1c77875b0c42d (patch)
tree39a2af9c7d3b356c3f10f3244da0ab0f12aa1081 /indra/llcommon/llframetimer.h
parent5762c1d0d727f0050aefe7126ab2d5280bebfb9b (diff)
BUILDFIX: some gcc build fixes
Diffstat (limited to 'indra/llcommon/llframetimer.h')
-rwxr-xr-xindra/llcommon/llframetimer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llframetimer.h b/indra/llcommon/llframetimer.h
index 7f61861072..d64009440c 100755
--- a/indra/llcommon/llframetimer.h
+++ b/indra/llcommon/llframetimer.h
@@ -52,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