aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-02-21 02:52:20 +0000
committerJustin Clark-Casey (justincc)2012-02-21 02:52:20 +0000
commit68a4ef5ef62aef3d5e1ec5c20b03b3b4fa51743b (patch)
treec524c268408a41df92ddf5f5bf68732103f0cfad /OpenSim/Region/Physics
parentFix bug where NPCs would establish child agents on other neighbour regions th... (diff)
downloadopensim-SC-68a4ef5ef62aef3d5e1ec5c20b03b3b4fa51743b.zip
opensim-SC-68a4ef5ef62aef3d5e1ec5c20b03b3b4fa51743b.tar.gz
opensim-SC-68a4ef5ef62aef3d5e1ec5c20b03b3b4fa51743b.tar.bz2
opensim-SC-68a4ef5ef62aef3d5e1ec5c20b03b3b4fa51743b.tar.xz
Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs15
1 files changed, 1 insertions, 14 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index e8bb476..478dd95 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -66,20 +66,7 @@ namespace OpenSim.Region.Physics.OdePlugin
66 // This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be 66 // This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be
67 // controlled in Ode.NET.dll.config 67 // controlled in Ode.NET.dll.config
68 if (Util.IsWindows()) 68 if (Util.IsWindows())
69 { 69 Util.LoadArchSpecificWindowsDll("ode.dll");
70 string nativeLibraryPath;
71
72 if (Util.Is64BitProcess())
73 nativeLibraryPath = "lib64/ode.dll";
74 else
75 nativeLibraryPath = "lib32/ode.dll";
76
77 m_log.DebugFormat("[ODE PLUGIN]: Loading native Windows ODE library at {0}", nativeLibraryPath);
78
79 if (Util.LoadLibrary(nativeLibraryPath) == IntPtr.Zero)
80 m_log.ErrorFormat(
81 "[ODE PLUGIN]: Couldn't find native Windows ODE library at {0}", nativeLibraryPath);
82 }
83 70
84 // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to 71 // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
85 // http://opensimulator.org/mantis/view.php?id=2750). 72 // http://opensimulator.org/mantis/view.php?id=2750).