aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Interfaces
diff options
context:
space:
mode:
authorMelanie Thielker2015-08-17 18:11:45 +0200
committerMelanie Thielker2015-08-17 18:11:45 +0200
commitee7debcca69d31573562dafead1f21d50931f632 (patch)
tree9c967ab1d0b639a209e13087acf5e6ceee7fde09 /OpenSim/Region/ScriptEngine/Interfaces
parentMerge branch 'master' of opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-ee7debcca69d31573562dafead1f21d50931f632.zip
opensim-SC_OLD-ee7debcca69d31573562dafead1f21d50931f632.tar.gz
opensim-SC_OLD-ee7debcca69d31573562dafead1f21d50931f632.tar.bz2
opensim-SC_OLD-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.cs5
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
28using System; 28using System;
29using System.Diagnostics;
30using System.Threading; 29using System.Threading;
31using OpenMetaverse; 30using OpenMetaverse;
32using OpenSim.Framework; 31using 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