diff options
| author | UbitUmarov | 2019-04-08 14:04:02 +0100 |
|---|---|---|
| committer | UbitUmarov | 2019-04-08 14:04:02 +0100 |
| commit | cadcf412ec55b38ff10596958cd09dd6ef4dfd3a (patch) | |
| tree | 23680aacec1c4736ca4aaeb57b8f24742846ddad /OpenSim | |
| parent | add osGetPSTWallclock() returns wall clock in PST or PDT, for those that for ... (diff) | |
| download | opensim-SC-cadcf412ec55b38ff10596958cd09dd6ef4dfd3a.zip opensim-SC-cadcf412ec55b38ff10596958cd09dd6ef4dfd3a.tar.gz opensim-SC-cadcf412ec55b38ff10596958cd09dd6ef4dfd3a.tar.bz2 opensim-SC-cadcf412ec55b38ff10596958cd09dd6ef4dfd3a.tar.xz | |
linux likes other tz names
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 4a74c15..de7da0e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -211,6 +211,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 211 | { | 211 | { |
| 212 | PSTTimeZone = null; | 212 | PSTTimeZone = null; |
| 213 | } | 213 | } |
| 214 | if(PSTTimeZone == null) | ||
| 215 | { | ||
| 216 | try | ||
| 217 | { | ||
| 218 | PSTTimeZone = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles"); | ||
| 219 | } | ||
| 220 | catch | ||
| 221 | { | ||
| 222 | PSTTimeZone = null; | ||
| 223 | } | ||
| 224 | } | ||
| 214 | } | 225 | } |
| 215 | 226 | ||
| 216 | public override Object InitializeLifetimeService() | 227 | public override Object InitializeLifetimeService() |