diff options
| author | Don Kjer <don@lindenlab.com> | 2007-10-11 00:28:42 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-10-11 00:28:42 +0000 |
| commit | 1b550aaec246063090fe7143145d69eebfbd4680 (patch) | |
| tree | 66b1d7c9f424e0183c5488037fcdae3a37916955 /indra/llcommon | |
| parent | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (diff) | |
EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release
ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/lldate.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp index 30916966af..37b912df3d 100644 --- a/indra/llcommon/lldate.cpp +++ b/indra/llcommon/lldate.cpp @@ -64,6 +64,8 @@ LLDate::LLDate(const std::string& iso8601_date) { if(!fromString(iso8601_date)) { + llwarns << "date " << iso8601_date << " failed to parse; " + << "ZEROING IT OUT" << llendl; mSecondsSinceEpoch = DATE_EPOCH; } } @@ -215,7 +217,7 @@ bool LLDate::fromStream(std::istream& s) s >> fractional; seconds_since_epoch += fractional; } - s.get(); // skip the Z + c = s.get(); // skip the Z if (c != 'Z') { return false; } mSecondsSinceEpoch = seconds_since_epoch; |