diff options
| author | Teravus Ovares | 2009-04-07 03:33:28 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2009-04-07 03:33:28 +0000 |
| commit | 0d4880d5cfe3835ab0d0b67427b60b5aedc3c50e (patch) | |
| tree | de8afed81c3def3df4f1649945e469bb9f52753d | |
| parent | * BulletDotNET Updates. (diff) | |
| download | opensim-SC_OLD-0d4880d5cfe3835ab0d0b67427b60b5aedc3c50e.zip opensim-SC_OLD-0d4880d5cfe3835ab0d0b67427b60b5aedc3c50e.tar.gz opensim-SC_OLD-0d4880d5cfe3835ab0d0b67427b60b5aedc3c50e.tar.bz2 opensim-SC_OLD-0d4880d5cfe3835ab0d0b67427b60b5aedc3c50e.tar.xz | |
* This fixes BulletDotNET so it can now be used on linux.
| -rw-r--r-- | OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs | 2 | ||||
| -rw-r--r-- | bin/libbulletnet.dll | bin | 350208 -> 351232 bytes | |||
| -rw-r--r-- | bin/libbulletnet.so | bin | 4212382 -> 4223694 bytes |
3 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs index 15c6798..b04c96e 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs | |||
| @@ -118,12 +118,14 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
| 118 | { | 118 | { |
| 119 | mesher = meshmerizer; | 119 | mesher = meshmerizer; |
| 120 | m_config = config; | 120 | m_config = config; |
| 121 | /* | ||
| 121 | if (Environment.OSVersion.Platform == PlatformID.Unix) | 122 | if (Environment.OSVersion.Platform == PlatformID.Unix) |
| 122 | { | 123 | { |
| 123 | m_log.Fatal("[BulletDotNET]: This configuration is not supported on *nix currently"); | 124 | m_log.Fatal("[BulletDotNET]: This configuration is not supported on *nix currently"); |
| 124 | Thread.Sleep(5000); | 125 | Thread.Sleep(5000); |
| 125 | Environment.Exit(0); | 126 | Environment.Exit(0); |
| 126 | } | 127 | } |
| 128 | */ | ||
| 127 | m_broadphase = new btAxisSweep3(worldAabbMin, worldAabbMax, 16000); | 129 | m_broadphase = new btAxisSweep3(worldAabbMin, worldAabbMax, 16000); |
| 128 | m_collisionConfiguration = new btDefaultCollisionConfiguration(); | 130 | m_collisionConfiguration = new btDefaultCollisionConfiguration(); |
| 129 | m_solver = new btSequentialImpulseConstraintSolver(); | 131 | m_solver = new btSequentialImpulseConstraintSolver(); |
diff --git a/bin/libbulletnet.dll b/bin/libbulletnet.dll index f2f9c65..d4d110e 100644 --- a/bin/libbulletnet.dll +++ b/bin/libbulletnet.dll | |||
| Binary files differ | |||
diff --git a/bin/libbulletnet.so b/bin/libbulletnet.so index 7530cdb..64e7f5f 100644 --- a/bin/libbulletnet.so +++ b/bin/libbulletnet.so | |||
| Binary files differ | |||