diff options
| author | UbitUmarov | 2016-10-08 01:27:02 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-10-08 01:27:02 +0100 |
| commit | 9843e3776ed4a613fb5682112e9e6b618cb14f9f (patch) | |
| tree | e6198111f4a331e331643ef00ddc29cc007d9af0 /bin | |
| parent | recover regions main http server ssl suport. Using a PKCS12 cert file, and no... (diff) | |
| parent | remove attachment to event OnPreAgentUpdate that is doing nothing (diff) | |
| download | opensim-SC-9843e3776ed4a613fb5682112e9e6b618cb14f9f.zip opensim-SC-9843e3776ed4a613fb5682112e9e6b618cb14f9f.tar.gz opensim-SC-9843e3776ed4a613fb5682112e9e6b618cb14f9f.tar.bz2 opensim-SC-9843e3776ed4a613fb5682112e9e6b618cb14f9f.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 418330e..d1ded36 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -293,7 +293,7 @@ | |||
| 293 | ;; OpenDynamicsEngine was the previous default physics engine in OpenSimulator 0.7.6.1 and before. | 293 | ;; OpenDynamicsEngine was the previous default physics engine in OpenSimulator 0.7.6.1 and before. |
| 294 | ;; It continues to provide a workable physics implementation. It does not currently support varregions. | 294 | ;; It continues to provide a workable physics implementation. It does not currently support varregions. |
| 295 | ;; basicphysics effectively does not model physics at all, making all objects phantom. | 295 | ;; basicphysics effectively does not model physics at all, making all objects phantom. |
| 296 | ;; Default is OpenDynamicsEngine | 296 | ;; Default is BulletSim |
| 297 | physics = BulletSim | 297 | physics = BulletSim |
| 298 | ;physics = modified_BulletX | 298 | ;physics = modified_BulletX |
| 299 | ;physics = OpenDynamicsEngine | 299 | ;physics = OpenDynamicsEngine |