Part two of Darok's Bullet physics plugin: added the actual plugin, although haven't added the project to prebuild.xml yet.

Also might have messed up some of the SVN properties on some of the folders, so if the cleaning lady has to come in again, I just hope she doesn't moan. 

2 files changed, 10 insertions, 0 deletions

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 0428f5a..10beaff 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -71,6 +71,11 @@ namespace OpenSim
                     physicsEngine = "RealPhysX";

                     allowFlying = true;

                 }

+                if (args[i] == "-bulletX")

+                {

+                    physicsEngine = "BulletXEngine";

+                    allowFlying = true;

+                }

                 if (args[i] == "-ode")

                 {

                     physicsEngine = "OpenDynamicsEngine";

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index bc9537b..48997e2 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -373,6 +373,11 @@ namespace OpenSim
                     this.m_physicsEngine = "OpenDynamicsEngine";

                     ScenePresence.PhysicsEngineFlying = true;

                     break;

+

+                case "BulletXEngine":

+                    this.m_physicsEngine = "BulletXEngine";

+                    ScenePresence.PhysicsEngineFlying = true;

+                    break;

             }

 

             configData.Commit();