diff options
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdePlugin.cs | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs index 5f5d547..05f6fae 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | |||
@@ -72,6 +72,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
72 | { | 72 | { |
73 | if (_mScene == null) | 73 | if (_mScene == null) |
74 | { | 74 | { |
75 | if (Util.IsWindows()) | ||
76 | Util.LoadArchSpecificWindowsDll("ode.dll"); | ||
77 | |||
75 | // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to | 78 | // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to |
76 | // http://opensimulator.org/mantis/view.php?id=2750). | 79 | // http://opensimulator.org/mantis/view.php?id=2750). |
77 | d.InitODE(); | 80 | d.InitODE(); |
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); |