diff options
| author | Melanie | 2012-03-09 09:47:09 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-09 09:47:09 +0100 |
| commit | 09d99cb2221fe6f172a2a4759e8b02bb801eea74 (patch) | |
| tree | b4cfb538104b722f935014e9d0fdc61d566aca90 /OpenSim/Region/Physics/UbitOdePlugin | |
| parent | Fix UbitODE dll mappping by simply copying the one from ODE.Net (diff) | |
| parent | let chode and ubitode find ode.dll on windows (diff) | |
| download | opensim-SC-09d99cb2221fe6f172a2a4759e8b02bb801eea74.zip opensim-SC-09d99cb2221fe6f172a2a4759e8b02bb801eea74.tar.gz opensim-SC-09d99cb2221fe6f172a2a4759e8b02bb801eea74.tar.bz2 opensim-SC-09d99cb2221fe6f172a2a4759e8b02bb801eea74.tar.xz | |
Merge branch 'ubitwork'
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdePlugin.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdePlugin.cs index 215d47a..d32188e 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdePlugin.cs | |||
| @@ -52,6 +52,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 52 | 52 | ||
| 53 | public bool Init() | 53 | public bool Init() |
| 54 | { | 54 | { |
| 55 | if (Util.IsWindows()) | ||
| 56 | Util.LoadArchSpecificWindowsDll("ode.dll"); | ||
| 57 | |||
| 55 | if (d.InitODE2(0) != 0) | 58 | if (d.InitODE2(0) != 0) |
| 56 | { | 59 | { |
| 57 | if (d.AllocateODEDataForThread(~0U) == 0) | 60 | if (d.AllocateODEDataForThread(~0U) == 0) |
| @@ -68,6 +71,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 68 | { | 71 | { |
| 69 | if (m_scene == null) | 72 | if (m_scene == null) |
| 70 | { | 73 | { |
| 74 | |||
| 71 | m_scene = new OdeScene(sceneIdentifier); | 75 | m_scene = new OdeScene(sceneIdentifier); |
| 72 | } | 76 | } |
| 73 | return (m_scene); | 77 | return (m_scene); |