summaryrefslogtreecommitdiff
path: root/indra/llcommon/lltimer.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-07-24 22:41:02 -0700
committerRichard Linden <none@none>2013-07-24 22:41:02 -0700
commit3430444212a14a7f40d8b1afdbefc68c3319562d (patch)
tree4453cb2d9cd277e5ea1a14bf617bab9f445b16b0 /indra/llcommon/lltimer.h
parent1e8f9fd80d0ac4e0eab656ed8e8e32f91ab8b533 (diff)
BUIDLFIX: forgot to extract value from units object for calling llformat
Diffstat (limited to 'indra/llcommon/lltimer.h')
-rwxr-xr-xindra/llcommon/lltimer.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h
index 9e464c4b1a..9f1f243dbb 100755
--- a/indra/llcommon/lltimer.h
+++ b/indra/llcommon/lltimer.h
@@ -62,14 +62,14 @@ public:
LLTimer();
~LLTimer();
- static void initClass() { if (!sTimer) sTimer = new LLTimer; }
- static void cleanupClass() { delete sTimer; sTimer = NULL; }
+ static void initClass();
+ static void cleanupClass();
// Return a high precision number of seconds since the start of
// this application instance.
static LLUnitImplicit<F64, LLUnits::Seconds> getElapsedSeconds()
{
- return sTimer->getElapsedTimeF64();
+ return sTimer ? sTimer->getElapsedTimeF64() : 0.0;
}
// Return a high precision usec since epoch