From 68a4ef5ef62aef3d5e1ec5c20b03b3b4fa51743b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 21 Feb 2012 02:52:20 +0000
Subject: Add 64 bit Windows sqlite3.dll and use this if running a 64-bit
 windows process.

---
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'OpenSim/Region/Physics')

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
                 // This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be
                 // controlled in Ode.NET.dll.config
                 if (Util.IsWindows())
-                {
-                    string nativeLibraryPath;
-
-                    if (Util.Is64BitProcess())
-                        nativeLibraryPath = "lib64/ode.dll";
-                    else
-                        nativeLibraryPath = "lib32/ode.dll";
-
-                    m_log.DebugFormat("[ODE PLUGIN]: Loading native Windows ODE library at {0}", nativeLibraryPath);
-
-                    if (Util.LoadLibrary(nativeLibraryPath) == IntPtr.Zero)
-                        m_log.ErrorFormat(
-                            "[ODE PLUGIN]: Couldn't find native Windows ODE library at {0}", nativeLibraryPath);
-                }
+                    Util.LoadArchSpecificWindowsDll("ode.dll");
 
                 // 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).
-- 
cgit v1.1