aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
diff options
context:
space:
mode:
authorMelanie2013-05-01 21:37:17 +0100
committerMelanie2013-05-01 21:37:17 +0100
commitc6d50cd431796fe81ba815541878e19b47b7bc08 (patch)
tree99689cc6142b821919d48efcfd03e857883c0b5f /OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
parentFix the long standing bug of items being delivered to lost and found or trash... (diff)
parentAdd in-code exaplanation for the change in cancellation signalling in STP 2.2... (diff)
downloadopensim-SC_OLD-c6d50cd431796fe81ba815541878e19b47b7bc08.zip
opensim-SC_OLD-c6d50cd431796fe81ba815541878e19b47b7bc08.tar.gz
opensim-SC_OLD-c6d50cd431796fe81ba815541878e19b47b7bc08.tar.bz2
opensim-SC_OLD-c6d50cd431796fe81ba815541878e19b47b7bc08.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index 35ae44c..b9a217b 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
51 public interface IScriptWorkItem 51 public interface IScriptWorkItem
52 { 52 {
53 bool Cancel(); 53 bool Cancel();
54 void Abort(); 54 bool Abort();
55 55
56 /// <summary> 56 /// <summary>
57 /// Wait for the work item to complete. 57 /// Wait for the work item to complete.