aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorRobert Adams2013-10-16 07:53:44 -0700
committerRobert Adams2013-10-16 07:53:44 -0700
commit8937a2244d65ea71c402777bb68a986f60982e07 (patch)
tree03601074b85b0c41ff15f5155a4b14c197954450 /bin/OpenSimDefaults.ini
parentvarregion: move the compressed heighmap compression factor from (diff)
parentBulletSim: implement the SL bug where VEHICLE_HOVER_UP_ONLY disables (diff)
downloadopensim-SC_OLD-8937a2244d65ea71c402777bb68a986f60982e07.zip
opensim-SC_OLD-8937a2244d65ea71c402777bb68a986f60982e07.tar.gz
opensim-SC_OLD-8937a2244d65ea71c402777bb68a986f60982e07.tar.bz2
opensim-SC_OLD-8937a2244d65ea71c402777bb68a986f60982e07.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini11
1 files changed, 5 insertions, 6 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index c090306..b56d5d1 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -229,14 +229,13 @@
229 ;CacheSculptMaps = true 229 ;CacheSculptMaps = true
230 230
231 ; Choose one of the physics engines below. 231 ; Choose one of the physics engines below.
232 ; OpenDynamicsEngine is by some distance the most developed physics engine. 232 ; BulletSim is a high performance physics engine. It is the default OpenSimulator physics engine
233 ; BulletSim is a high performance, up-and-coming physics engine. 233 ; OpenDynamicsEngine is another developed physics engine that was the previous default in OpenSimulator 0.7.6 and before
234 ; basicphysics effectively does not model physics at all, making all objects phantom. 234 physics = BulletSim
235 physics = OpenDynamicsEngine 235 ;physics = modified_BulletX
236 ;physics = OpenDynamicsEngine
236 ;physics = basicphysics 237 ;physics = basicphysics
237 ;physics = POS 238 ;physics = POS
238 ;physics = modified_BulletX
239 ;physics = BulletSim
240 239
241 ; ## 240 ; ##
242 ; ## SCRIPT ENGINE 241 ; ## SCRIPT ENGINE