aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2012-04-25 01:22:09 +0100
committerMelanie2012-04-25 01:22:09 +0100
commitdef65cd94a18115d1a9cb89d735715c1f708a81d (patch)
tree7fd2c4c5ebb563bf7225d244b80739e9df134566 /OpenSim/Services
parentMerge branch 'master' into careminster (diff)
parentComment out some debug ATTACHMENTS log messages for now. (diff)
downloadopensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.zip
opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.gz
opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.bz2
opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs31
1 files changed, 18 insertions, 13 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index e773321..2953cb5 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -357,21 +357,26 @@ namespace OpenSim.Services.LLLoginService
357 { 357 {
358 TimeZoneInfo gridTimeZone; 358 TimeZoneInfo gridTimeZone;
359 359
360 try 360 // Disabled for now pending making timezone a config value, which can at some point have a default of
361 { 361 // a ; separated list of possible timezones.
362 // First try to fetch DST from Pacific Standard Time, because this is 362 // The problem here is that US/Pacific (or even the Olsen America/Los_Angeles) is not universal across
363 // the one expected by the viewer. "US/Pacific" is the string to search 363 // windows, mac and various distributions of linux, introducing another element of consistency.
364 // on linux and mac, and should work also on Windows (to confirm) 364 // The server operator needs to be able to control this setting
365 gridTimeZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific"); 365// try
366 } 366// {
367 catch (Exception e) 367// // First try to fetch DST from Pacific Standard Time, because this is
368 { 368// // the one expected by the viewer. "US/Pacific" is the string to search
369 m_log.WarnFormat( 369// // on linux and mac, and should work also on Windows (to confirm)
370 "[TIMEZONE]: {0} Falling back to system time. System time should be set to Pacific Standard Time to provide the expected time", 370// gridTimeZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific");
371 e.Message); 371// }
372// catch (Exception e)
373// {
374// m_log.WarnFormat(
375// "[TIMEZONE]: {0} Falling back to system time. System time should be set to Pacific Standard Time to provide the expected time",
376// e.Message);
372 377
373 gridTimeZone = TimeZoneInfo.Local; 378 gridTimeZone = TimeZoneInfo.Local;
374 } 379// }
375 380
376 DST = gridTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N"; 381 DST = gridTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
377 382