diff options
author | Diva Canto | 2014-09-21 09:23:15 -0700 |
---|---|---|
committer | Diva Canto | 2014-09-21 09:23:15 -0700 |
commit | c4cd98bc34571e58563ea700681d99bb006b92f6 (patch) | |
tree | 2372934b5b16d994ba0568bd4c230104d0b15bc2 /bin/OpenSimDefaults.ini | |
parent | Fixed a hard-to-run-into bug in groups: at the time of creation of a group, t... (diff) | |
parent | Merge branch 'master' into bullet-2.82 (diff) | |
download | opensim-SC_OLD-c4cd98bc34571e58563ea700681d99bb006b92f6.zip opensim-SC_OLD-c4cd98bc34571e58563ea700681d99bb006b92f6.tar.gz opensim-SC_OLD-c4cd98bc34571e58563ea700681d99bb006b92f6.tar.bz2 opensim-SC_OLD-c4cd98bc34571e58563ea700681d99bb006b92f6.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-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 dce01eb..5361e8d 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -1024,7 +1024,7 @@ | |||
1024 | ; BulletEngine = "bulletxna" | 1024 | ; BulletEngine = "bulletxna" |
1025 | 1025 | ||
1026 | ; BulletSim can run on its own thread independent of the simulator's heartbeat | 1026 | ; BulletSim can run on its own thread independent of the simulator's heartbeat |
1027 | ; thread. Enabling this will nto let the physics engine slow down avatar movement, etc. | 1027 | ; thread. Enabling this will not let the physics engine slow down avatar movement, etc. |
1028 | UseSeparatePhysicsThread = false | 1028 | UseSeparatePhysicsThread = false |
1029 | 1029 | ||
1030 | ; Terrain implementation can use either Bullet's heightField or BulletSim can build | 1030 | ; Terrain implementation can use either Bullet's heightField or BulletSim can build |