summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-15 14:35:21 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-15 14:35:21 +0100
commit10c722604a0c52f5dc23b9d8c52703aad024daa2 (patch)
treeb671462f287e622cc5e3358810adc67b960d8cfa /indra/llcommon
parentb3fc9c79f559c84893dede3ce643ac0dfd1f3d65 (diff)
Backed out changeset 6d51a12cb2d8
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/lldate.cpp23
1 files changed, 2 insertions, 21 deletions
diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp
index a7ef28b431..de7f2ead74 100644
--- a/indra/llcommon/lldate.cpp
+++ b/indra/llcommon/lldate.cpp
@@ -248,27 +248,8 @@ bool LLDate::fromStream(std::istream& s)
s >> fractional;
seconds_since_epoch += fractional;
}
-
- c = s.peek(); // check for offset
- if (c == '+' || c == '-')
- {
- S32 offset_sign = (c == '+') ? 1 : -1;
- S32 offset_hours = 0;
- S32 offset_minutes = 0;
- S32 offset_in_seconds = 0;
-
- s >> offset_hours;
-
- c = s.get(); // skip the colon a get the minutes if there are any
- if (c == ':')
- {
- s >> offset_minutes;
- }
-
- offset_in_seconds = (offset_hours * 60 + offset_sign * offset_minutes) * 60;
- seconds_since_epoch -= offset_in_seconds;
- }
- else if (c != 'Z') { return false; } // skip the Z
+ c = s.get(); // skip the Z
+ if (c != 'Z') { return false; }
mSecondsSinceEpoch = seconds_since_epoch;
return true;