Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs

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
         {
             TimeZoneInfo gridTimeZone;
 
-            try
-            {
-                // First try to fetch DST from Pacific Standard Time, because this is
-                // the one expected by the viewer. "US/Pacific" is the string to search 
-                // on linux and mac, and should work also on Windows (to confirm)
-                gridTimeZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific");
-            }
-            catch (Exception e)
-            {
-                m_log.WarnFormat(
-                    "[TIMEZONE]: {0} Falling back to system time. System time should be set to Pacific Standard Time to provide the expected time",
-                    e.Message);
+            // Disabled for now pending making timezone a config value, which can at some point have a default of
+            // a ; separated list of possible timezones.
+            // The problem here is that US/Pacific (or even the Olsen America/Los_Angeles) is not universal across
+            // windows, mac and various distributions of linux, introducing another element of consistency.
+            // The server operator needs to be able to control this setting
+//            try
+//            {
+//                // First try to fetch DST from Pacific Standard Time, because this is
+//                // the one expected by the viewer. "US/Pacific" is the string to search 
+//                // on linux and mac, and should work also on Windows (to confirm)
+//                gridTimeZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific");
+//            }
+//            catch (Exception e)
+//            {
+//                m_log.WarnFormat(
+//                    "[TIMEZONE]: {0} Falling back to system time. System time should be set to Pacific Standard Time to provide the expected time",
+//                    e.Message);
 
                 gridTimeZone = TimeZoneInfo.Local;
-            }
+//            }
 
             DST = gridTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";