diff options
| author | Melanie | 2013-02-12 23:21:26 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-12 23:21:26 +0000 |
| commit | 467e8d56b533df287e59724188f3980f6dc979dd (patch) | |
| tree | d47411cc608c6382305bb5f0c3384d79ecf63d2e /OpenSim/Region/ScriptEngine/Interfaces | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Extend TestJsonCreateStore() with a one key input and an input with raw numbe... (diff) | |
| download | opensim-SC-467e8d56b533df287e59724188f3980f6dc979dd.zip opensim-SC-467e8d56b533df287e59724188f3980f6dc979dd.tar.gz opensim-SC-467e8d56b533df287e59724188f3980f6dc979dd.tar.bz2 opensim-SC-467e8d56b533df287e59724188f3980f6dc979dd.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs index f68612c..35ae44c 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | |||
| @@ -52,7 +52,12 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
| 52 | { | 52 | { |
| 53 | bool Cancel(); | 53 | bool Cancel(); |
| 54 | void Abort(); | 54 | void Abort(); |
| 55 | bool Wait(TimeSpan t); | 55 | |
| 56 | /// <summary> | ||
| 57 | /// Wait for the work item to complete. | ||
| 58 | /// </summary> | ||
| 59 | /// <param name='t'>The number of milliseconds to wait. Must be >= -1 (Timeout.Infinite).</param> | ||
| 60 | bool Wait(int t); | ||
| 56 | } | 61 | } |
| 57 | 62 | ||
| 58 | /// <summary> | 63 | /// <summary> |