aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
diff options
context:
space:
mode:
authorRobert Adams2013-05-01 12:08:12 -0700
committerRobert Adams2013-05-01 12:08:12 -0700
commitfca4e4ec7c044921ba602862c5a42900f819015a (patch)
treef3a1e0b09b7a454009437dd9b1015891a85eadb8 /OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
parentBulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working... (diff)
parentAdd in-code exaplanation for the change in cancellation signalling in STP 2.2... (diff)
downloadopensim-SC-fca4e4ec7c044921ba602862c5a42900f819015a.zip
opensim-SC-fca4e4ec7c044921ba602862c5a42900f819015a.tar.gz
opensim-SC-fca4e4ec7c044921ba602862c5a42900f819015a.tar.bz2
opensim-SC-fca4e4ec7c044921ba602862c5a42900f819015a.tar.xz
Merge branch 'master' into bulletsim4
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.