aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTeravus Ovares2009-04-07 03:33:28 +0000
committerTeravus Ovares2009-04-07 03:33:28 +0000
commit0d4880d5cfe3835ab0d0b67427b60b5aedc3c50e (patch)
treede8afed81c3def3df4f1649945e469bb9f52753d /OpenSim/Region
parent* BulletDotNET Updates. (diff)
downloadopensim-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.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs2
1 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();