aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/AvatarService/AvatarService.cs2
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs26
2 files changed, 26 insertions, 2 deletions
diff --git a/OpenSim/Services/AvatarService/AvatarService.cs b/OpenSim/Services/AvatarService/AvatarService.cs
index c59a9e0..423c781 100644
--- a/OpenSim/Services/AvatarService/AvatarService.cs
+++ b/OpenSim/Services/AvatarService/AvatarService.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Services.AvatarService
93 if (kvp.Key.StartsWith("_")) 93 if (kvp.Key.StartsWith("_"))
94 count++; 94 count++;
95 95
96 m_log.DebugFormat("[AVATAR SERVICE]: SetAvatar for {0}, attachs={1}", principalID, count); 96// m_log.DebugFormat("[AVATAR SERVICE]: SetAvatar for {0}, attachs={1}", principalID, count);
97 m_Database.Delete("PrincipalID", principalID.ToString()); 97 m_Database.Delete("PrincipalID", principalID.ToString());
98 98
99 AvatarBaseData av = new AvatarBaseData(); 99 AvatarBaseData av = new AvatarBaseData();
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";