aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/Application.cs5
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
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
71 physicsEngine = "RealPhysX"; 71 physicsEngine = "RealPhysX";
72 allowFlying = true; 72 allowFlying = true;
73 } 73 }
74 if (args[i] == "-bulletX")
75 {
76 physicsEngine = "BulletXEngine";
77 allowFlying = true;
78 }
74 if (args[i] == "-ode") 79 if (args[i] == "-ode")
75 { 80 {
76 physicsEngine = "OpenDynamicsEngine"; 81 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
373 this.m_physicsEngine = "OpenDynamicsEngine"; 373 this.m_physicsEngine = "OpenDynamicsEngine";
374 ScenePresence.PhysicsEngineFlying = true; 374 ScenePresence.PhysicsEngineFlying = true;
375 break; 375 break;
376
377 case "BulletXEngine":
378 this.m_physicsEngine = "BulletXEngine";
379 ScenePresence.PhysicsEngineFlying = true;
380 break;
376 } 381 }
377 382
378 configData.Commit(); 383 configData.Commit();