diff options
author | Justin Clark-Casey (justincc) | 2014-05-06 17:28:21 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-05-06 17:28:21 +0100 |
commit | 539165e6bd87b3a4cc76b5a730abb88017bff555 (patch) | |
tree | 3b5cae3712d70ff1c859a2c40fb90f9df3070264 /bin/OpenSimDefaults.ini | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-539165e6bd87b3a4cc76b5a730abb88017bff555.zip opensim-SC-539165e6bd87b3a4cc76b5a730abb88017bff555.tar.gz opensim-SC-539165e6bd87b3a4cc76b5a730abb88017bff555.tar.bz2 opensim-SC-539165e6bd87b3a4cc76b5a730abb88017bff555.tar.xz |
minor: Change configuration text in config files to reflect the existing situation of BulletSim as the default physics engine.
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r-- | bin/OpenSimDefaults.ini | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index df332ca..cae2958 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -234,9 +234,12 @@ | |||
234 | ; to false if you have compatibility problems. | 234 | ; to false if you have compatibility problems. |
235 | ;CacheSculptMaps = true | 235 | ;CacheSculptMaps = true |
236 | 236 | ||
237 | ; Choose one of the physics engines below. | 237 | ;; BulletSim is the default physics engine. It provides the best performance and most functionality. |
238 | ; BulletSim is a high performance physics engine. It is the default OpenSimulator physics engine | 238 | ;; BulletSim supports varregions. |
239 | ; OpenDynamicsEngine is another developed physics engine that was the previous default in OpenSimulator 0.7.6 and before | 239 | ;; OpenDynamicsEngine was the previous default physics engine in OpenSimulator 0.7.6.1 and before. |
240 | ;; It continues to provide a workable physics implementation. It does not currently support varregions. | ||
241 | ;; basicphysics effectively does not model physics at all, making all objects phantom. | ||
242 | ;; Default is OpenDynamicsEngine | ||
240 | physics = BulletSim | 243 | physics = BulletSim |
241 | ;physics = modified_BulletX | 244 | ;physics = modified_BulletX |
242 | ;physics = OpenDynamicsEngine | 245 | ;physics = OpenDynamicsEngine |