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/OSSL_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/OSSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 10ec34d..6ff6b00 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -144,7 +144,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 144 | protected IUrlModule m_UrlModule = null; | 144 | protected IUrlModule m_UrlModule = null; |
| 145 | 145 | ||
| 146 | public void Initialize( | 146 | public void Initialize( |
| 147 | IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle) | 147 | IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle) |
| 148 | { | 148 | { |
| 149 | m_ScriptEngine = scriptEngine; | 149 | m_ScriptEngine = scriptEngine; |
| 150 | m_host = host; | 150 | m_host = host; |