From 19f7fb6ccce52224cc067e496d1480191badb165 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 25 Jul 2013 13:48:38 -0700
Subject: BUIDLFIX: bad ternary expression
---
indra/llcommon/lltimer.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h
index 9f1f243dbb..f2dc59e405 100755
--- a/indra/llcommon/lltimer.h
+++ b/indra/llcommon/lltimer.h
@@ -69,7 +69,14 @@ public:
// this application instance.
static LLUnitImplicit<F64, LLUnits::Seconds> getElapsedSeconds()
{
- return sTimer ? sTimer->getElapsedTimeF64() : 0.0;
+ if (sTimer)
+ {
+ return sTimer->getElapsedTimeF64();
+ }
+ else
+ {
+ return 0;
+ }
}
// Return a high precision usec since epoch
--
cgit v1.2.3