BulletSim: move selection of the unmanaged Bullet DLL from BSPlugin

into the unmanaged Bullet interface class.

1 files changed, 8 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
index 83e12ba..8c6e7d6 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
@@ -31,6 +31,8 @@ using System.Runtime.InteropServices;
 using System.Security;
 using System.Text;
 
+using OpenSim.Framework;
+
 using OpenMetaverse;
 
 namespace OpenSim.Region.Physics.BulletSPlugin
@@ -141,8 +143,14 @@ public override string BulletEngineVersion { get; protected set; }
 public BSAPIUnman(string paramName, BSScene physScene)
 {
     PhysicsScene = physScene;
+
     // Do something fancy with the paramName to get the right DLL implementation
     //     like "Bullet-2.80-OpenCL-Intel" loading the version for Intel based OpenCL implementation, etc.
+    if (Util.IsWindows())
+        Util.LoadArchSpecificWindowsDll("BulletSim.dll");
+    // If not Windows, loading is performed by the
+    // Mono loader as specified in
+    // "bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config".
 }
 
 // Initialization and simulation