diff options
| author | Diva Canto | 2013-05-06 09:18:17 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-05-06 09:18:17 -0700 |
| commit | a81ddf3d7097a2e0959080ae7291357435b0bd5b (patch) | |
| tree | 688ceb63aa41d8eb9d3af27bd57d39cbd38ca250 /OpenSim/Region/ScriptEngine/Interfaces | |
| parent | Minor reordering of operations on NewUserConnection. The agent circuit needs ... (diff) | |
| parent | Merge branch 'master' into bulletsim4 (diff) | |
| download | opensim-SC-a81ddf3d7097a2e0959080ae7291357435b0bd5b.zip opensim-SC-a81ddf3d7097a2e0959080ae7291357435b0bd5b.tar.gz opensim-SC-a81ddf3d7097a2e0959080ae7291357435b0bd5b.tar.bz2 opensim-SC-a81ddf3d7097a2e0959080ae7291357435b0bd5b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Interfaces')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | 2 |
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. |