diff options
| author | UbitUmarov | 2016-11-27 15:14:34 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-11-27 15:14:34 +0000 |
| commit | 877d3092b45723a2fe8b3a5bbc224cd5d5e55e82 (patch) | |
| tree | f11a5b2d85443fefc81e1958c82828a16fc656cc /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |
| parent | fix pool parameters for httptests (diff) | |
| parent | HG on links request build the URI in http format with a / at end, this should... (diff) | |
| download | opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.zip opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.gz opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.bz2 opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index d725907..7129c8a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -880,7 +880,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 880 | try | 880 | try |
| 881 | { | 881 | { |
| 882 | m_CurrentEvent = data.EventName; | 882 | m_CurrentEvent = data.EventName; |
| 883 | m_EventStart = DateTime.Now; | 883 | m_EventStart = DateTime.UtcNow; |
| 884 | m_InEvent = true; | 884 | m_InEvent = true; |
| 885 | 885 | ||
| 886 | try | 886 | try |
| @@ -1033,7 +1033,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 1033 | if (!m_InEvent) | 1033 | if (!m_InEvent) |
| 1034 | return 0; | 1034 | return 0; |
| 1035 | 1035 | ||
| 1036 | return (DateTime.Now - m_EventStart).Seconds; | 1036 | return (DateTime.UtcNow - m_EventStart).Seconds; |
| 1037 | } | 1037 | } |
| 1038 | 1038 | ||
| 1039 | public void ResetScript(int timeout) | 1039 | public void ResetScript(int timeout) |