diff options
author | Melanie Thielker | 2015-08-17 21:46:30 +0200 |
---|---|---|
committer | Melanie Thielker | 2015-08-17 21:46:30 +0200 |
commit | c53f732163b391e4bcd33c8acb917deb7598e0a8 (patch) | |
tree | 6b396d1678db3ddbdecef28099666461452cf81c /OpenSim/Region/ScriptEngine/Interfaces | |
parent | Revert "When scripts are sleeping, don't count that as execution time" (diff) | |
download | opensim-SC_OLD-c53f732163b391e4bcd33c8acb917deb7598e0a8.zip opensim-SC_OLD-c53f732163b391e4bcd33c8acb917deb7598e0a8.tar.gz opensim-SC_OLD-c53f732163b391e4bcd33c8acb917deb7598e0a8.tar.bz2 opensim-SC_OLD-c53f732163b391e4bcd33c8acb917deb7598e0a8.tar.xz |
Change the IScriptApi back to it's original form, removing XEngine
specific additions that should not have been there in the first place.
Sleeping and time measurement are now completely internal to XEngine
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Interfaces')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs index 30e99b0..b9970bf 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs | |||
@@ -46,6 +46,6 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
46 | /// <param name='item'>/param> | 46 | /// <param name='item'>/param> |
47 | /// <param name='coopSleepHandle'>/param> | 47 | /// <param name='coopSleepHandle'>/param> |
48 | void Initialize( | 48 | void Initialize( |
49 | IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle); | 49 | IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item); |
50 | } | 50 | } |
51 | } \ No newline at end of file | 51 | } |
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs index b8fdd01..6355669 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs | |||
@@ -110,5 +110,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
110 | ParameterInfo[] ScriptBaseClassParameters { get; } | 110 | ParameterInfo[] ScriptBaseClassParameters { get; } |
111 | 111 | ||
112 | IScriptApi GetApi(UUID itemID, string name); | 112 | IScriptApi GetApi(UUID itemID, string name); |
113 | |||
114 | void SleepScript(UUID itemID, int delay); | ||
113 | } | 115 | } |
114 | } | 116 | } |
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs index 16641f7..e4297c4 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | |||
@@ -29,6 +29,7 @@ using System; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Threading; | 31 | using System.Threading; |
32 | using System.Diagnostics; | ||
32 | using OpenMetaverse; | 33 | using OpenMetaverse; |
33 | using log4net; | 34 | using log4net; |
34 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
@@ -163,6 +164,9 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
163 | void ClearQueue(); | 164 | void ClearQueue(); |
164 | int StartParam { get; set; } | 165 | int StartParam { get; set; } |
165 | 166 | ||
167 | WaitHandle CoopWaitHandle { get; } | ||
168 | Stopwatch ExecutionTimer { get; } | ||
169 | |||
166 | void RemoveState(); | 170 | void RemoveState(); |
167 | 171 | ||
168 | void Init(); | 172 | void Init(); |