diff options
| author | Robert Adams | 2013-01-23 16:23:11 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-01-23 16:23:11 -0800 |
| commit | 5b334079e0b3f93b616259210a12c590143f4f36 (patch) | |
| tree | b53e7c58b3c7d1f58c93b1e0818c432f9d273793 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
| parent | BulletSim: pass up and report the real collision penetration. (diff) | |
| parent | Merge branch 'master' into cooptermination (diff) | |
| download | opensim-SC_OLD-5b334079e0b3f93b616259210a12c590143f4f36.zip opensim-SC_OLD-5b334079e0b3f93b616259210a12c590143f4f36.tar.gz opensim-SC_OLD-5b334079e0b3f93b616259210a12c590143f4f36.tar.bz2 opensim-SC_OLD-5b334079e0b3f93b616259210a12c590143f4f36.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 5c0ff1c..1426070 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -143,7 +143,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 143 | protected IUrlModule m_UrlModule = null; | 143 | protected IUrlModule m_UrlModule = null; |
| 144 | 144 | ||
| 145 | public void Initialize( | 145 | public void Initialize( |
| 146 | IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle) | 146 | IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle) |
| 147 | { | 147 | { |
| 148 | m_ScriptEngine = scriptEngine; | 148 | m_ScriptEngine = scriptEngine; |
| 149 | m_host = host; | 149 | m_host = host; |