diff options
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
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 80d17d9..ced0bce 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -937,7 +937,7 @@ | |||
937 | FixedTimeStep = .01667 | 937 | FixedTimeStep = .01667 |
938 | 938 | ||
939 | MaxCollisionsPerFrame = 2048 | 939 | MaxCollisionsPerFrame = 2048 |
940 | MaxUpdatesPerFrame = 8192 | 940 | MaxUpdatesPerFrame = 2048 |
941 | 941 | ||
942 | [RemoteAdmin] | 942 | [RemoteAdmin] |
943 | enabled = false | 943 | enabled = false |