Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2 files changed, 24 insertions, 3 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index 3763696..8587a2b 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -30,7 +30,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using Nini.Config;
-using log4net;
+using log4net;

+using OpenSim.Framework;
 
 namespace OpenSim.Region.Physics.Manager
 {
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 716161a..6ee2714 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Physics.OdePlugin
     /// </summary>
     public class OdePlugin : IPhysicsPlugin
     {
-        //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         private OdeScene m_scene;
 
@@ -59,13 +59,33 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
             if (m_scene == null)
             {
+                // We do this so that OpenSimulator on Windows loads the correct native ODE library depending on whether
+                // it's running as a 32-bit process or a 64-bit one.  By invoking LoadLibary here, later DLLImports
+                // will find it already loaded later on.
+                //
+                // 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);
+                    Util.LoadLibrary(nativeLibraryPath);
+                }
+
                 // 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).
                 d.InitODE();
                 
                 m_scene = new OdeScene(sceneIdentifier);
             }
-            return (m_scene);
+
+            return m_scene;
         }
 
         public string GetName()