diff options
| author | Melanie | 2013-01-24 00:25:08 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-24 00:25:08 +0000 |
| commit | be4c8c4931637b7b0849d12c634599c702483364 (patch) | |
| tree | 9a49626efcc10f1272b37176616a41476b044045 /OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' into cooptermination (diff) | |
| download | opensim-SC-be4c8c4931637b7b0849d12c634599c702483364.zip opensim-SC-be4c8c4931637b7b0849d12c634599c702483364.tar.gz opensim-SC-be4c8c4931637b7b0849d12c634599c702483364.tar.bz2 opensim-SC-be4c8c4931637b7b0849d12c634599c702483364.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs index d2323f5..30e99b0 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs | |||
| @@ -46,6 +46,6 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
| 46 | /// <param name='item'>/param> | 46 | /// <param name='item'>/param> |
| 47 | /// <param name='coopSleepHandle'>/param> | 47 | /// <param name='coopSleepHandle'>/param> |
| 48 | void Initialize( | 48 | void Initialize( |
| 49 | IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle); | 49 | IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle); |
| 50 | } | 50 | } |
| 51 | } \ No newline at end of file | 51 | } \ No newline at end of file |