diff options
author | Mic Bowman | 2012-04-25 09:52:44 -0700 |
---|---|---|
committer | Mic Bowman | 2012-04-25 09:52:44 -0700 |
commit | 1afae013111b7c817037371fca805a78c3ab67cc (patch) | |
tree | dc4f08217c64fd92f4fac250344f009f583fca4e /OpenSim/Services/LLLoginService/LLLoginResponse.cs | |
parent | Add try/catch around Json script method registration to avoild some issues (diff) | |
parent | Slight rewording of output messages. (diff) | |
download | opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.zip opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.gz opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.bz2 opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginResponse.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 844c5ae..01de159 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -349,7 +349,31 @@ namespace OpenSim.Services.LLLoginService | |||
349 | 349 | ||
350 | private void SetDefaultValues() | 350 | private void SetDefaultValues() |
351 | { | 351 | { |
352 | DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N"; | 352 | TimeZoneInfo gridTimeZone; |
353 | |||
354 | // Disabled for now pending making timezone a config value, which can at some point have a default of | ||
355 | // a ; separated list of possible timezones. | ||
356 | // The problem here is that US/Pacific (or even the Olsen America/Los_Angeles) is not universal across | ||
357 | // windows, mac and various distributions of linux, introducing another element of consistency. | ||
358 | // The server operator needs to be able to control this setting | ||
359 | // try | ||
360 | // { | ||
361 | // // First try to fetch DST from Pacific Standard Time, because this is | ||
362 | // // the one expected by the viewer. "US/Pacific" is the string to search | ||
363 | // // on linux and mac, and should work also on Windows (to confirm) | ||
364 | // gridTimeZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific"); | ||
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); | ||
371 | |||
372 | gridTimeZone = TimeZoneInfo.Local; | ||
373 | // } | ||
374 | |||
375 | DST = gridTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N"; | ||
376 | |||
353 | StipendSinceLogin = "N"; | 377 | StipendSinceLogin = "N"; |
354 | Gendered = "Y"; | 378 | Gendered = "Y"; |
355 | EverLoggedIn = "Y"; | 379 | EverLoggedIn = "Y"; |