From 49a6d1baf414c82d8d427ba5de816621c0da4b86 Mon Sep 17 00:00:00 2001
From: "Olivier van Helden and Gudule Lapointe (Speculoos.net)"
 <olivier@van-helden.net>
Date: Thu, 19 Apr 2012 01:17:56 +0200
Subject: [PATCH] DST settings to match client default Pacific Time (mantis
 #5972)

---
 OpenSim/Services/LLLoginService/LLLoginResponse.cs |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 1a874c8..54b8d9b 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -340,7 +340,20 @@ namespace OpenSim.Services.LLLoginService
 
         private void SetDefaultValues()
         {
-            DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+            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)
+                TimeZoneInfo slZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific");
+                DST = slZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+            }
+            catch (Exception e)
+            {
+                m_log.Warn("[TIMEZONE]: " + e.Message + " Falling back to system time. System time should be set to Pacific Standard Time to provide the expected time");
+                DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+            }
+
             StipendSinceLogin = "N";
             Gendered = "Y";
             EverLoggedIn = "Y";
-- 
1.7.7

From a46db362a47ec24cb8b4e7132c293e6d7e0840d5 Mon Sep 17 00:00:00 2001
From: "Olivier van Helden and Gudule Lapointe (Speculoos.net)"
 <olivier@van-helden.net>
Date: Thu, 19 Apr 2012 01:17:56 +0200
Subject: [PATCH] DST settings to match client default Pacific Time (mantis
 #5972)

---
 OpenSim/Services/LLLoginService/LLLoginResponse.cs |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 1a874c8..3d9e01d 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -340,7 +340,21 @@ namespace OpenSim.Services.LLLoginService
 
         private void SetDefaultValues()
         {
-            DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+            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);
+                gridTimeZone = TimeZoneInfo.Local;
+            }
+            DST = gridTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+
             StipendSinceLogin = "N";
             Gendered = "Y";
             EverLoggedIn = "Y";
-- 
1.7.7

From a46db362a47ec24cb8b4e7132c293e6d7e0840d5 Mon Sep 17 00:00:00 2001
From: "Olivier van Helden and Gudule Lapointe (Speculoos.net)"
 <olivier@van-helden.net>
Date: Thu, 19 Apr 2012 01:17:56 +0200
Subject: [PATCH 1/2] DST settings to match client default Pacific Time
 (mantis #5972)

---
 OpenSim/Services/LLLoginService/LLLoginResponse.cs |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 1a874c8..3d9e01d 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -340,7 +340,21 @@ namespace OpenSim.Services.LLLoginService
 
         private void SetDefaultValues()
         {
-            DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+            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);
+                gridTimeZone = TimeZoneInfo.Local;
+            }
+            DST = gridTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+
             StipendSinceLogin = "N";
             Gendered = "Y";
             EverLoggedIn = "Y";
-- 
1.7.7


From 7118940c625d128f5bcaa8ca2120c4fd9e548ef6 Mon Sep 17 00:00:00 2001
From: "Olivier van Helden and Gudule Lapointe (Speculoos.net)"
 <olivier@van-helden.net>
Date: Wed, 25 Apr 2012 05:14:16 +0200
Subject: [PATCH 2/2] Correction on DST settings (mantis #5972) Better
 handling of DST, including Windows-style time zone
 format. Changed gridTimeZone var name to
 defaultTimeZone to reflect actual purpose

---
 OpenSim/Services/LLLoginService/LLLoginResponse.cs |   34 +++++++++++++-------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 3d9e01d..3de02b2 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -340,20 +340,30 @@ namespace OpenSim.Services.LLLoginService
 
         private void SetDefaultValues()
         {
-            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)
+            TimeZoneInfo defaultTimeZone;
+            // First try to fetch DST from Pacific Standard Time, because this is the one expected by the viewer.
+            // Fall back to local if all formats failed
+            string defaultTimeZones="America/Los_Angeles;US/Pacific;Pacific Standard Time;Local";
+            string[] tzList = defaultTimeZones.Split(';');
+            foreach (string tzName in tzList)
             {
-                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;
+                if(tzName == "Local")
+                {
+                    m_log.Warn("[TIMEZONE]: Falling back to system time. System time should be set to Pacific Standard Time to provide the expected Daylight Saving Time status");
+                    defaultTimeZone = TimeZoneInfo.Local;
+                    break;
+                }
+                try
+                {
+                    defaultTimeZone = TimeZoneInfo.FindSystemTimeZoneById(tzName);
+                }
+                catch (Exception e)
+                {
+                    continue;
+                }
+                break;
             }
-            DST = gridTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+            DST = defaultTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
 
             StipendSinceLogin = "N";
             Gendered = "Y";
-- 
1.7.7

From d616944ce2c2ca96429cd325f254a503ed8504a6 Mon Sep 17 00:00:00 2001
From: "Olivier van Helden and Gudule Lapointe (Speculoos.net)"
 <olivier@van-helden.net>
Date: Thu, 19 Apr 2012 01:17:56 +0200
Subject: [PATCH] DST settings to match client default Pacific Time (mantis
 #5972) Including Windows-style time zone format. Added
 OverrideDST ini paramater, to choose default (Pacific Time)
 local (system time) or off (no DST). DST check moved to
 LLLoginResponse instead of SetDefaultValues

---
 OpenSim/Services/LLLoginService/LLLoginResponse.cs |   37 +++++++++++++++++++-
 OpenSim/Services/LLLoginService/LLLoginService.cs  |    6 +++-
 bin/Robust.HG.ini.example                          |    9 +++++
 bin/config-include/StandaloneCommon.ini.example    |    9 +++++
 4 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 1a874c8..1fbd91a 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -220,7 +220,7 @@ namespace OpenSim.Services.LLLoginService
         public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
             GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
             string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
-            GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency)
+            GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency, string overrideDST)
             : this()
         {
             FillOutInventoryData(invSkel, libService);
@@ -247,6 +247,41 @@ namespace OpenSim.Services.LLLoginService
 
             FillOutSeedCap(aCircuit, destination, clientIP);
             
+            TimeZoneInfo dstTimeZone;
+            switch (overrideDST)
+            {
+                case "off":
+                    DST = "N";
+                    break;
+                case "local":
+                    DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+                    break;
+                default:
+                    string dstTimeZones="America/Los_Angeles;US/Pacific;Pacific Standard Time";
+                    string[] tzList = dstTimeZones.Split(';');
+                    foreach (string tzName in tzList)
+                    {
+                        try
+                        {
+                            dstTimeZone = TimeZoneInfo.FindSystemTimeZoneById(tzName);
+                        }
+                        catch (Exception e)
+                        {
+                            continue;
+                        }
+                        break;
+                    }
+                    try
+                    {
+                        DST = dstTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.WarnFormat("[TIMEZONE]: No valid timezone found, falling back to system time. System time should be set to Pacific Standard Time to provide consistent Daylight Saving Time. {0}", e);
+                        DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+                    }
+                    break;
+            }
         }
 
         private void FillOutInventoryData(List<InventoryFolderBase> invSkel, ILibraryService libService)
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 5dff512..3d9ab92 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -80,6 +80,8 @@ namespace OpenSim.Services.LLLoginService
         protected string m_AllowedClients;
         protected string m_DeniedClients;
 
+        protected string m_OverrideDST;
+
         IConfig m_LoginServerConfig;
 //        IConfig m_ClientsConfig;
 
@@ -114,6 +116,8 @@ namespace OpenSim.Services.LLLoginService
             m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty);
             m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty);
 
+            m_OverrideDST = m_LoginServerConfig.GetString("OverrideDST", "default");
+
             // Clean up some of these vars
             if (m_MapTileURL != String.Empty)
             {
@@ -413,7 +417,7 @@ namespace OpenSim.Services.LLLoginService
                 // Finally, fill out the response and return it
                 //
                 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
-                    where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency);
+                    where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency, m_OverrideDST);
 
                 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
                 return response;
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index ab5880d..5acb0ca 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -272,6 +272,15 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ;AllowedClients = ""
     ;DeniedClients = ""
 
+    ;# {OverrideDST} {} {Override US/Pacific Daylight Saving Time rules} {default off local} default
+    ;; Viewers do not listen to timezone sent by the server. They use Pacific Standard Time instead,
+    ;; but rely on the server to calculate Daylight Saving Time. Sending another DST than US Pacific
+    ;; would result in time inconsistencies between grids (during summer and around DST transition period)
+    ;;   "default"  let OpenSim calculate US Pacific DST
+    ;;   "off"      disable DST (equivallent to "local" with system set to GMT)
+    ;;   "local"    force legacy behaviour (using local system time to calculate DST)
+    ; OverrideDST = default
+
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 	; Set this if you want to change the default
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 2a7e49e..d29e1fd 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -123,6 +123,15 @@
     ;AllowedClients = ""
     ;DeniedClients = ""
 
+    ;# {OverrideDST} {} {Override US/Pacific Daylight Saving Time rules} {default off local} default
+    ;; Viewers do not listen to timezone sent by the server. They use Pacific Standard Time instead,
+    ;; but rely on the server to calculate Daylight Saving Time. Sending another DST than US Pacific
+    ;; would result in time inconsistencies between grids (during summer and around DST transition period)
+    ;;   "default"  let OpenSim calculate US Pacific DST
+    ;;   "off"      disable DST (equivallent to "local" with system set to GMT)
+    ;;   "local"    force legacy behaviour (using local system time to calculate DST)
+    ; OverrideDST = default
+
 [GatekeeperService]
     ExternalName = "http://127.0.0.1:9000"
 
-- 
1.7.7

From 7cc062d3dff9df8501c147b1f11ebcd1e9fd51bf Mon Sep 17 00:00:00 2001
From: "Olivier van Helden and Gudule Lapointe (Speculoos.net)"
 <olivier@van-helden.net>
Date: Thu, 19 Apr 2012 01:17:56 +0200
Subject: [PATCH] Fix Daylight Saving Time bug, match client default Pacific
 Time (mantis #5972) DST calculated on
 America/Los_Angeles;Pacific Standard Time Can be overridden
 with LoginService DSTZone parameter - none: no DST - local:
 use system time to calculate DST (legacy behaviour) -
 custom string: interpreted as timezone definition, fallback
 to system time

---
 OpenSim/Services/LLLoginService/LLLoginResponse.cs |   36 +++++++++++++++++++-
 OpenSim/Services/LLLoginService/LLLoginService.cs  |    6 +++-
 bin/Robust.HG.ini.example                          |    9 +++++
 bin/Robust.ini.example                             |    9 +++++
 bin/config-include/Standalone.ini                  |    9 +++++
 5 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 1a874c8..422a849 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -220,7 +220,7 @@ namespace OpenSim.Services.LLLoginService
         public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
             GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
             string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
-            GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency)
+            GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency, string DSTZone)
             : this()
         {
             FillOutInventoryData(invSkel, libService);
@@ -247,6 +247,40 @@ namespace OpenSim.Services.LLLoginService
 
             FillOutSeedCap(aCircuit, destination, clientIP);
             
+            TimeZoneInfo dstTimeZone = null;
+            switch (DSTZone)
+            {
+                case "none":
+                    DST = "N";
+                    break;
+                case "local":
+                    DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+                    break;
+                default:
+                    string[] tzList = DSTZone.Split(';');
+                    foreach (string tzName in tzList)
+                    {
+                        try
+                        {
+                            dstTimeZone = TimeZoneInfo.FindSystemTimeZoneById(tzName);
+                        }
+                        catch (Exception e)
+                        {
+                            continue;
+                        }
+                        break;
+                    }
+                    if(dstTimeZone == null)
+                    {
+                        m_log.Warn("[TIMEZONE]: No valid timezone found for DST, falling back to system time. System time should be set to Pacific Standard Time to provide consistent Daylight Saving Time. {0}");
+                        DST = TimeZone.CurrentTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+                    }
+                    else
+                    {
+                        DST = dstTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";
+                    }
+                    break;
+            }
         }
 
         private void FillOutInventoryData(List<InventoryFolderBase> invSkel, ILibraryService libService)
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 5dff512..090c680 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -80,6 +80,8 @@ namespace OpenSim.Services.LLLoginService
         protected string m_AllowedClients;
         protected string m_DeniedClients;
 
+        protected string m_DSTZone;
+
         IConfig m_LoginServerConfig;
 //        IConfig m_ClientsConfig;
 
@@ -114,6 +116,8 @@ namespace OpenSim.Services.LLLoginService
             m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty);
             m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty);
 
+            m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time");
+
             // Clean up some of these vars
             if (m_MapTileURL != String.Empty)
             {
@@ -413,7 +417,7 @@ namespace OpenSim.Services.LLLoginService
                 // Finally, fill out the response and return it
                 //
                 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
-                    where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency);
+                    where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone);
 
                 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
                 return response;
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index ab5880d..d0c94a0 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -272,6 +272,15 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ;AllowedClients = ""
     ;DeniedClients = ""
 
+    ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
+    ;; Viewers do not listen to timezone sent by the server. They use Pacific Standard Time instead,
+    ;; but rely on the server to calculate Daylight Saving Time. Sending another DST than US Pacific
+    ;; would result in time inconsistencies between grids (during summer and around DST transition period)
+    ;;   default    let OpenSim calculate US Pacific DST
+    ;;   "none"     disable DST (equivallent to "local" with system set to GMT)
+    ;;   "local"    force legacy behaviour (using local system time to calculate DST)
+    ; DSTZone = "America/Los_Angeles;Pacific Standard Time"
+
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 	; Set this if you want to change the default
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 90f7b5c..90ca485 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -244,6 +244,15 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ;AllowedClients = ""
     ;DeniedClients = ""
 
+    ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
+    ;; Viewers do not listen to timezone sent by the server. They use Pacific Standard Time instead,
+    ;; but rely on the server to calculate Daylight Saving Time. Sending another DST than US Pacific
+    ;; would result in time inconsistencies between grids (during summer and around DST transition period)
+    ;;   default    let OpenSim calculate US Pacific DST
+    ;;   "none"     disable DST (equivallent to "local" with system set to GMT)
+    ;;   "local"    force legacy behaviour (using local system time to calculate DST)
+    ; DSTZone = "America/Los_Angeles;Pacific Standard Time"
+
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 	; Set this if you want to change the default
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index d307387..c95f060 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -95,6 +95,15 @@
 
     WelcomeMessage = "Welcome, Avatar!"
 
+    ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
+    ;; Viewers do not listen to timezone sent by the server. They use Pacific Standard Time instead,
+    ;; but rely on the server to calculate Daylight Saving Time. Sending another DST than US Pacific
+    ;; would result in time inconsistencies between grids (during summer and around DST transition period)
+    ;;   default    let OpenSim calculate US Pacific DST
+    ;;   "none"     disable DST (equivallent to "local" with system set to GMT)
+    ;;   "local"    force legacy behaviour (using local system time to calculate DST)
+    ; DSTZone = "America/Los_Angeles;Pacific Standard Time"
+
 [MapImageService]
 	LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 	; in minutes
-- 
1.7.7