diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index f06fd24..613d704 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3283,26 +3283,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3283 | msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here | 3283 | msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here |
3284 | // m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); | 3284 | // m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); |
3285 | // m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); | 3285 | // m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); |
3286 | DateTime dt = DateTime.UtcNow; | 3286 | // DateTime dt = DateTime.UtcNow; |
3287 | 3287 | // | |
3288 | // Ticks from UtcNow, but make it look like local. Evil, huh? | 3288 | // // Ticks from UtcNow, but make it look like local. Evil, huh? |
3289 | dt = DateTime.SpecifyKind(dt, DateTimeKind.Local); | 3289 | // dt = DateTime.SpecifyKind(dt, DateTimeKind.Local); |
3290 | 3290 | // | |
3291 | try | 3291 | // try |
3292 | { | 3292 | // { |
3293 | // Convert that to the PST timezone | 3293 | // // Convert that to the PST timezone |
3294 | TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles"); | 3294 | // TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles"); |
3295 | dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo); | 3295 | // dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo); |
3296 | } | 3296 | // } |
3297 | catch | 3297 | // catch |
3298 | { | 3298 | // { |
3299 | // No logging here, as it could be VERY spammy | 3299 | // // No logging here, as it could be VERY spammy |
3300 | } | 3300 | // } |
3301 | 3301 | // | |
3302 | // And make it look local again to fool the unix time util | 3302 | // // And make it look local again to fool the unix time util |
3303 | dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc); | 3303 | // dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc); |
3304 | 3304 | ||
3305 | msg.timestamp = (uint)Util.ToUnixTime(dt); | 3305 | msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); |
3306 | 3306 | ||
3307 | //if (client != null) | 3307 | //if (client != null) |
3308 | //{ | 3308 | //{ |