summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-07-25 13:48:38 -0700
committerRichard Linden <none@none>2013-07-25 13:48:38 -0700
commit19f7fb6ccce52224cc067e496d1480191badb165 (patch)
treea8163536eb1138b25a0a8636ef71f2a0c611bf42 /indra/llcommon
parentdce3f9bc8f9b838e5ffc6ff584bee1080076c039 (diff)
BUIDLFIX: bad ternary expression
Diffstat (limited to 'indra/llcommon')
-rwxr-xr-xindra/llcommon/lltimer.h9
1 files changed, 8 insertions, 1 deletions
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