Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

1 files changed, 21 insertions, 0 deletions

diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 582af27..1c04ab5 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -250,6 +250,27 @@ 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"
+
+    ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
+    ;; Viewers do not receive timezone information from the server - almost all (?) default to Pacific Standard Time
+    ;; However, they do rely on the server to tell them whether it's Daylight Saving Time or not.
+    ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
+    ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
+    ;; Options are
+    ;;   "none"     no DST 
+    ;;   "local"    use the server's only timezone to calculate DST.  This is previous OpenSimulator behaviour.
+    ;;   "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
+    ;;      'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
+    DSTZone = "America/Los_Angeles;Pacific Standard Time"
+
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
         ; Set this if you want to change the default