From b14b65ea9518e02e518f2a75795385a3c0306495 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 1 Jan 2013 17:01:17 -0800
Subject: BulletSim: move selection of the unmanaged Bullet DLL from BSPlugin
 into the unmanaged Bullet interface class.

---
 OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs | 8 ++++++++
 OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs   | 6 ------
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region')

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
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
index 20f5180..65be52a 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
@@ -59,12 +59,6 @@ public class BSPlugin : IPhysicsPlugin
     {
         if (_mScene == null)
         {
-            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".
-
             _mScene = new BSScene(sceneIdentifier);
         }
         return (_mScene);
-- 
cgit v1.1