diff options
author | Justin Clark-Casey (justincc) | 2012-04-24 23:00:50 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-24 23:00:50 +0100 |
commit | 54d5ff67747ada5c0252a5063c29d6dc0deb074e (patch) | |
tree | fb633dfe1478c03f6a95bd28a27f939289ab5704 /OpenSim | |
parent | Revert "Refactored how asset/inventory types are associated with content type... (diff) | |
download | opensim-SC_OLD-54d5ff67747ada5c0252a5063c29d6dc0deb074e.zip opensim-SC_OLD-54d5ff67747ada5c0252a5063c29d6dc0deb074e.tar.gz opensim-SC_OLD-54d5ff67747ada5c0252a5063c29d6dc0deb074e.tar.bz2 opensim-SC_OLD-54d5ff67747ada5c0252a5063c29d6dc0deb074e.tar.xz |
Go back to always using the local timezone for now - not all machines have US/Pacific or Olsen Amercia/Los_Angeles and this introduces variability that the server operator cannot control
Please see http://opensimulator.org/mantis/view.php?id=5972 soon for more comments.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 10a44ed..01de159 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -351,21 +351,26 @@ namespace OpenSim.Services.LLLoginService | |||
351 | { | 351 | { |
352 | TimeZoneInfo gridTimeZone; | 352 | TimeZoneInfo gridTimeZone; |
353 | 353 | ||
354 | try | 354 | // Disabled for now pending making timezone a config value, which can at some point have a default of |
355 | { | 355 | // a ; separated list of possible timezones. |
356 | // First try to fetch DST from Pacific Standard Time, because this is | 356 | // The problem here is that US/Pacific (or even the Olsen America/Los_Angeles) is not universal across |
357 | // the one expected by the viewer. "US/Pacific" is the string to search | 357 | // windows, mac and various distributions of linux, introducing another element of consistency. |
358 | // on linux and mac, and should work also on Windows (to confirm) | 358 | // The server operator needs to be able to control this setting |
359 | gridTimeZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific"); | 359 | // try |
360 | } | 360 | // { |
361 | catch (Exception e) | 361 | // // First try to fetch DST from Pacific Standard Time, because this is |
362 | { | 362 | // // the one expected by the viewer. "US/Pacific" is the string to search |
363 | m_log.WarnFormat( | 363 | // // on linux and mac, and should work also on Windows (to confirm) |
364 | "[TIMEZONE]: {0} Falling back to system time. System time should be set to Pacific Standard Time to provide the expected time", | 364 | // gridTimeZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific"); |
365 | e.Message); | 365 | // } |
366 | // catch (Exception e) | ||
367 | // { | ||
368 | // m_log.WarnFormat( | ||
369 | // "[TIMEZONE]: {0} Falling back to system time. System time should be set to Pacific Standard Time to provide the expected time", | ||
370 | // e.Message); | ||
366 | 371 | ||
367 | gridTimeZone = TimeZoneInfo.Local; | 372 | gridTimeZone = TimeZoneInfo.Local; |
368 | } | 373 | // } |
369 | 374 | ||
370 | DST = gridTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N"; | 375 | DST = gridTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N"; |
371 | 376 | ||