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/Shared/Api/Implementation/CM_Api.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' into cooptermination (diff) | |
| download | opensim-SC_OLD-be4c8c4931637b7b0849d12c634599c702483364.zip opensim-SC_OLD-be4c8c4931637b7b0849d12c634599c702483364.tar.gz opensim-SC_OLD-be4c8c4931637b7b0849d12c634599c702483364.tar.bz2 opensim-SC_OLD-be4c8c4931637b7b0849d12c634599c702483364.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs index d03955b..fce8ff8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs | |||
| @@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 63 | internal TaskInventoryItem m_item; | 63 | internal TaskInventoryItem m_item; |
| 64 | internal bool m_CMFunctionsEnabled = false; | 64 | internal bool m_CMFunctionsEnabled = false; |
| 65 | 65 | ||
| 66 | public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle) | 66 | public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle) |
| 67 | { | 67 | { |
| 68 | m_ScriptEngine = ScriptEngine; | 68 | m_ScriptEngine = ScriptEngine; |
| 69 | m_host = host; | 69 | m_host = host; |