diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-27 15:12:42 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-27 15:12:42 -0700 |
| commit | fee7b15417d2bb1374ec9f861db77e51cbca7fe5 (patch) | |
| tree | 8f7e0655602996316d083500bcdbe52137c2e72a /indra/llcommon/llstring.cpp | |
| parent | 6cb420b20bd509e7bf62c8450f12d433c5a81be2 (diff) | |
| parent | c7a6a2e08f34b2cd21816a905c21e8017646001c (diff) | |
Merge
Diffstat (limited to 'indra/llcommon/llstring.cpp')
| -rw-r--r-- | indra/llcommon/llstring.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index b5a73ec1d1..637064d75f 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -694,14 +694,17 @@ void LLStringOps::setupDatetimeInfo (bool daylight) nowT = time (NULL); - tmpT = localtime (&nowT); - localT = mktime (tmpT); - tmpT = gmtime (&nowT); gmtT = mktime (tmpT); + tmpT = localtime (&nowT); + localT = mktime (tmpT); + sLocalTimeOffset = (long) (gmtT - localT); - + if (tmpT->tm_isdst) + { + sLocalTimeOffset -= 60 * 60; // 1 hour + } sPacificDaylightTime = daylight; sPacificTimeOffset = (sPacificDaylightTime? 7 : 8 ) * 60 * 60; |