summaryrefslogtreecommitdiff
path: root/indra/llcommon/lldate.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-08-19 10:20:55 -0700
committerRichard Linden <none@none>2013-08-19 10:20:55 -0700
commit08eb52c10ca1f916d937fe1927eb659f6d69a6d3 (patch)
tree98e7faecca7ded1dd8732dfef7c13abd424b858b /indra/llcommon/lldate.cpp
parent4290365ebbf5505bee4fbed8043996fa7687fd03 (diff)
parent612892b45a3413b16e40c49d3bfde77a4ca927fd (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 cb6f239396..4f2e1304b2 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(LLUnitImplicit<F64, LLUnits::Seconds> seconds_since_epoch) :
+LLDate::LLDate(F64SecondsImplicit seconds_since_epoch) :
mSecondsSinceEpoch(seconds_since_epoch.value())
{}