diff options
| author | simon <none@none> | 2014-05-07 13:19:05 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-05-07 13:19:05 -0700 |
| commit | dc4c184696b308b8f60fa1dd751b35e22bd47d62 (patch) | |
| tree | 1606d992f1cce6fe19572042c456725eb95d7066 /indra/llcommon/lldate.h | |
| parent | 883467a3cc421fca68a25589114e0e3f0538ff0e (diff) | |
| parent | 250db74bf9325acdc1169f6c13d297e7fe44b753 (diff) | |
Merge downstream version 3.7.8 code
Diffstat (limited to 'indra/llcommon/lldate.h')
| -rwxr-xr-x | indra/llcommon/lldate.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/lldate.h b/indra/llcommon/lldate.h index 7ff8b550ad..be2cd2d051 100755 --- a/indra/llcommon/lldate.h +++ b/indra/llcommon/lldate.h @@ -33,6 +33,7 @@ #include <string> #include "stdtypes.h" +#include "llunits.h" /** * @class LLDate @@ -56,9 +57,9 @@ public: /** * @brief Construct a date from a seconds since epoch value. * - * @pararm seconds_since_epoch The number of seconds since UTC epoch. + * @param seconds_since_epoch The number of seconds since UTC epoch. */ - LLDate(F64 seconds_since_epoch); + LLDate(F64SecondsImplicit seconds_since_epoch); /** * @brief Construct a date from a string representation |