Merge pull request #1555 from secondlife/lua-timers

Add timer support to the Lua viewer

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp
index c63c7012d1..592b7cff1b 100644
--- a/indra/llcommon/lldate.cpp
+++ b/indra/llcommon/lldate.cpp
@@ -41,9 +41,9 @@
 #include "llstring.h"
 #include "llfasttimer.h"
 
-static const F64 DATE_EPOCH = 0.0;
+static const LLDate::timestamp DATE_EPOCH = 0.0;
 
-static const F64 LL_APR_USEC_PER_SEC = 1000000.0;
+static const LLDate::timestamp LL_APR_USEC_PER_SEC = 1000000.0;
     // should be APR_USEC_PER_SEC, but that relies on INT64_C which
     // isn't defined in glib under our build set up for some reason
 
@@ -233,13 +233,13 @@ bool LLDate::fromStream(std::istream& s)
         return false;
     }
 
-    F64 seconds_since_epoch = time / LL_APR_USEC_PER_SEC;
+    timestamp seconds_since_epoch = time / LL_APR_USEC_PER_SEC;
 
     // check for fractional
     c = s.peek();
     if(c == '.')
     {
-        F64 fractional = 0.0;
+        timestamp fractional = 0.0;
         s >> fractional;
         seconds_since_epoch += fractional;
     }
@@ -299,12 +299,12 @@ bool LLDate::fromYMDHMS(S32 year, S32 month, S32 day, S32 hour, S32 min, S32 sec
     return true;
 }
 
-F64 LLDate::secondsSinceEpoch() const
+LLDate::timestamp LLDate::secondsSinceEpoch() const
 {
     return mSecondsSinceEpoch;
 }
 
-void LLDate::secondsSinceEpoch(F64 seconds)
+void LLDate::secondsSinceEpoch(timestamp seconds)
 {
     mSecondsSinceEpoch = seconds;
 }