OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork'

avinationmerge
Melanie 2012-03-09 09:47:09 +01:00
parent c521f3b348 13f340077c
commit 09d99cb222
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
View File

@ -72,6 +72,9 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
if (_mScene == null) if (_mScene == null)
{ {
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("ode.dll");
// Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
// http://opensimulator.org/mantis/view.php?id=2750). // http://opensimulator.org/mantis/view.php?id=2750).
d.InitODE(); d.InitODE();

4
OpenSim/Region/Physics/UbitOdePlugin/OdePlugin.cs
View File

@ -52,6 +52,9 @@ namespace OpenSim.Region.Physics.OdePlugin
public bool Init() public bool Init()
{ {
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("ode.dll");
if (d.InitODE2(0) != 0) if (d.InitODE2(0) != 0)
{ {
if (d.AllocateODEDataForThread(~0U) == 0) if (d.AllocateODEDataForThread(~0U) == 0)
@ -68,6 +71,7 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
if (m_scene == null) if (m_scene == null)
{ {
m_scene = new OdeScene(sceneIdentifier); m_scene = new OdeScene(sceneIdentifier);
} }
return (m_scene); return (m_scene);