On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit

In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory.
However, this is completely untested since I don't currently own a 64-bit Windows box.  Feedback appreciated.
Using OpenSim.32BitLaunch.exe should continue to work.  Other platforms are unaffected.
This will currently not work with sqlite - I will add that too if this works.

4 files changed, 64 insertions, 5 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 545e76c..0dd01af 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -308,7 +308,9 @@ namespace OpenSim.Framework.Servers
             // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
             // the clr version number doesn't match the project version number under Mono.
             //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
-            m_log.Info("[STARTUP]: Operating system version: " + Environment.OSVersion + Environment.NewLine);
+            m_log.InfoFormat(
+                "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n",
+                Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
             
             StartupSpecific();
             
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 4b0b13c..b3ec5c2 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -35,7 +35,8 @@ using System.IO;
 using System.IO.Compression;
 using System.Net;
 using System.Net.Sockets;
-using System.Reflection;
+using System.Reflection;

+using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Security.Cryptography;
@@ -375,6 +376,20 @@ namespace OpenSim.Framework
             }
 
             return sb.ToString();
+        }

+

+        /// <summary>

+        /// Is the platform Windows?

+        /// </summary>

+        /// <returns>true if so, false otherwise</returns>

+        public static bool IsWindows()

+        {

+            PlatformID platformId = Environment.OSVersion.Platform;

+

+            return (platformId == PlatformID.Win32NT

+                || platformId == PlatformID.Win32S

+                || platformId == PlatformID.Win32Windows

+                || platformId == PlatformID.WinCE);

         }
 
         public static bool IsEnvironmentSupported(ref string reason)
@@ -1457,6 +1472,27 @@ namespace OpenSim.Framework
             }
 
             return data;
+        }

+

+        /// <summary>

+        /// Used to trigger an early library load on Windows systems.

+        /// </summary>

+        /// <remarks>

+        /// Required to get 32-bit and 64-bit processes to automatically use the

+        /// appropriate native library.

+        /// </remarks>

+        /// <param name="dllToLoad"></param>

+        /// <returns></returns>

+        [DllImport("kernel32.dll")]

+        public static extern IntPtr LoadLibrary(string dllToLoad);

+

+        /// <summary>

+        /// Determine whether the current process is 64 bit

+        /// </summary>

+        /// <returns>true if so, false if not</returns>

+        public static bool Is64BitProcess()

+        {

+            return IntPtr.Size == 8;

         }
 
         #region FireAndForget Threading Pattern
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()