aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Interfaces
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-16 01:45:09 +0000
committerJustin Clark-Casey (justincc)2013-01-16 01:45:09 +0000
commitb8949024bc55c62b9268b35d4f2a568760b9d7d3 (patch)
tree7b8d984c957fab7aba5aceec66967adb5e8a0d51 /OpenSim/Region/ScriptEngine/Interfaces
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.zip
opensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.gz
opensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.bz2
opensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.xz
Revert "Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)"
Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api. This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Interfaces')
-rw-r--r--OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs13
1 files changed, 0 insertions, 13 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index 38fff52..9de2d72 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Threading;
32using OpenMetaverse; 31using OpenMetaverse;
33using log4net; 32using log4net;
34using OpenSim.Framework; 33using OpenSim.Framework;
@@ -182,18 +181,6 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
182 void Resume(); 181 void Resume();
183 182
184 /// <summary> 183 /// <summary>
185 /// If true then scripts should look to terminate their threads in co-operation with the script engine rather
186 /// than through Thread.Abort()
187 /// </summary>
188 bool CoopTermination { get; }
189
190 /// <summary>
191 /// Used for script sleeps when we are using co-operative script termination.
192 /// </summary>
193 /// <remarks>null if CoopTermination is not active</remarks>
194 EventWaitHandle CoopSleepHandle { get; }
195
196 /// <summary>
197 /// Process the next event queued for this script instance. 184 /// Process the next event queued for this script instance.
198 /// </summary> 185 /// </summary>
199 /// <returns></returns> 186 /// <returns></returns>