diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs b/OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs
index 5d8fbd9129..bea3f22618 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs
@@ -143,15 +143,8 @@ namespace OpenSim.Region.PhysicsModule.BulletS
public BSAPIUnman(string paramName, BSScene physScene)
{
+ DllmapConfigHelper.RegisterAssembly(typeof(BSAPIUnman).Assembly);
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/bin/OpenSim.Region.PhysicsModule.BulletS.dll.config b/bin/OpenSim.Region.PhysicsModule.BulletS.dll.config
index 605ad6563f..1dfd53903e 100755
--- a/bin/OpenSim.Region.PhysicsModule.BulletS.dll.config
+++ b/bin/OpenSim.Region.PhysicsModule.BulletS.dll.config
@@ -2,8 +2,8 @@
-
+
-
-
+
+
diff --git a/bin/libBulletSim.dylib b/bin/libBulletSim.dylib
deleted file mode 100644
index ff44a4594a..0000000000
Binary files a/bin/libBulletSim.dylib and /dev/null differ
diff --git a/bin/libBulletSim.so b/bin/libBulletSim.so
deleted file mode 100644
index 2bf11596fe..0000000000
Binary files a/bin/libBulletSim.so and /dev/null differ
diff --git a/prebuild.xml b/prebuild.xml
index 58aea1ef3f..83231af184 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1611,6 +1611,7 @@
../../../../bin/
+