aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin
diff options
context:
space:
mode:
authorUbitUmarov2012-03-09 04:19:39 +0000
committerUbitUmarov2012-03-09 04:19:39 +0000
commit13f340077c20808fe17b5c737a87613156a3b1b3 (patch)
treec5cd0d83cacc5ba51434f1e5e84e850fd8faa187 /OpenSim/Region/Physics/UbitOdePlugin
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
downloadopensim-SC-13f340077c20808fe17b5c737a87613156a3b1b3.zip
opensim-SC-13f340077c20808fe17b5c737a87613156a3b1b3.tar.gz
opensim-SC-13f340077c20808fe17b5c737a87613156a3b1b3.tar.bz2
opensim-SC-13f340077c20808fe17b5c737a87613156a3b1b3.tar.xz
let chode and ubitode find ode.dll on windows
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdePlugin.cs4
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);