diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-10-14 14:03:16 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-10-14 14:03:16 -0700 |
| commit | 508686047d5e98934d5fefbb576e54f108df6fe3 (patch) | |
| tree | 6d751588cc200395d4fef41e61f4683a83a7ab86 /indra/llcommon/llstring.cpp | |
| parent | 2303ec6213ea7a591e0084e9fc9350b2afddd3c5 (diff) | |
| parent | f53f6f20df5c99311103c3d92938ce878d474f13 (diff) | |
Merge from http://hg.secondlife.com/viewer-identity (display names)
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 ae7e624a1a..f3b48b0156 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -731,14 +731,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; |