diff options
author | Melanie Thielker | 2015-08-17 18:11:45 +0200 |
---|---|---|
committer | Melanie Thielker | 2015-08-17 18:11:45 +0200 |
commit | ee7debcca69d31573562dafead1f21d50931f632 (patch) | |
tree | 9c967ab1d0b639a209e13087acf5e6ceee7fde09 /OpenSim/Region/ScriptEngine/Interfaces | |
parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-ee7debcca69d31573562dafead1f21d50931f632.zip opensim-SC-ee7debcca69d31573562dafead1f21d50931f632.tar.gz opensim-SC-ee7debcca69d31573562dafead1f21d50931f632.tar.bz2 opensim-SC-ee7debcca69d31573562dafead1f21d50931f632.tar.xz |
Revert "When scripts are sleeping, don't count that as execution time"
The approach is good but the way it is written breaks the architecture.
Rewrite follows.
This reverts commit a568f06b7faea807149205d0e47454e4883e4836.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Interfaces')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs index 0f65877..30e99b0 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs | |||
@@ -26,7 +26,6 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Diagnostics; | ||
30 | using System.Threading; | 29 | using System.Threading; |
31 | using OpenMetaverse; | 30 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
@@ -46,9 +45,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
46 | /// <param name='host'>/param> | 45 | /// <param name='host'>/param> |
47 | /// <param name='item'>/param> | 46 | /// <param name='item'>/param> |
48 | /// <param name='coopSleepHandle'>/param> | 47 | /// <param name='coopSleepHandle'>/param> |
49 | /// <param name="executionTimer">The timer used to measure how long the script has executed</param> | ||
50 | void Initialize( | 48 | void Initialize( |
51 | IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle, | 49 | IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle); |
52 | Stopwatch executionTimer); | ||
53 | } | 50 | } |
54 | } \ No newline at end of file | 51 | } \ No newline at end of file |