From daee2eda93c3135964784417f81c5cb4ce52871f Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Tue, 21 Feb 2012 04:10:39 +0000
Subject: [PATCH] Load 32-bit or 64-bit BulletSim Windows library automatically
 as appropriate.

This uses the same approach as ODE.
radams, if this doesn't work for you please feel free to revert.
---
 OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs |   3 +++
 bin/{ => lib32}/BulletSim.dll                    | Bin
 bin/{ => lib64}/BulletSim-x86_64.dll             | Bin
 3 files changed, 3 insertions(+)
 rename bin/{ => lib32}/BulletSim.dll (100%)
 rename bin/{ => lib64}/BulletSim-x86_64.dll (100%)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
index 61be56d184..0730824ce1 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs
@@ -51,6 +51,9 @@ public class BSPlugin : IPhysicsPlugin
     {
         if (_mScene == null)
         {
+            if (Util.IsWindows())
+                Util.LoadArchSpecificWindowsDll("BulletSim.dll");
+
             _mScene = new BSScene(sceneIdentifier);
         }
         return (_mScene);
diff --git a/bin/BulletSim.dll b/bin/lib32/BulletSim.dll
similarity index 100%
rename from bin/BulletSim.dll
rename to bin/lib32/BulletSim.dll
diff --git a/bin/BulletSim-x86_64.dll b/bin/lib64/BulletSim-x86_64.dll
similarity index 100%
rename from bin/BulletSim-x86_64.dll
rename to bin/lib64/BulletSim-x86_64.dll