summaryrefslogtreecommitdiff
path: root/indra/llcommon/lldate.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-06-17 01:20:27 -0700
committerRichard Linden <none@none>2013-06-17 01:20:27 -0700
commit1cb0c974ae410479a1f72dab556ef7c9371970ee (patch)
tree91a97b4b05e8085fdad17173b7ca874bb98a8805 /indra/llcommon/lldate.cpp
parentfc88265cffe3553803314c6e895a1e3a3c988171 (diff)
parent3f2de87340b1c831ea59e4a3ca960d49f343c9fd (diff)
Merge
Diffstat (limited to 'indra/llcommon/lldate.cpp')
-rwxr-xr-xindra/llcommon/lldate.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp
index 2efe39e158..7892269e35 100755
--- a/indra/llcommon/lldate.cpp
+++ b/indra/llcommon/lldate.cpp
@@ -55,7 +55,7 @@ LLDate::LLDate(const LLDate& date) :
mSecondsSinceEpoch(date.mSecondsSinceEpoch)
{}
-LLDate::LLDate(LLUnit<LLUnits::Seconds, F64> seconds_since_epoch) :
+LLDate::LLDate(LLUnit<F64, LLUnits::Seconds> seconds_since_epoch) :
mSecondsSinceEpoch(seconds_since_epoch.value())
{}