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
author: ubit 2012-08-04 11:42:59 +0200
committer: ubit 2012-08-04 11:42:59 +0200
commit: dfb77330a8f5abac2acd72db196d1020a25697c1 (patch)
tree: 8be49aa7fb6917cd5feeb4b7246d416bcc41d06a /bin/OpenSimDefaults.ini
parent: Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent: update ode.dll for windows so both 32b and 64b are now version 0.12 (32b (diff)
download: opensim-SC_OLD-dfb77330a8f5abac2acd72db196d1020a25697c1.zip
opensim-SC_OLD-dfb77330a8f5abac2acd72db196d1020a25697c1.tar.gz
opensim-SC_OLD-dfb77330a8f5abac2acd72db196d1020a25697c1.tar.bz2
opensim-SC_OLD-dfb77330a8f5abac2acd72db196d1020a25697c1.tar.xz
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 @@
    FixedTimeStep = .01667
    MaxCollisionsPerFrame = 2048
-    MaxUpdatesPerFrame = 8192
+    MaxUpdatesPerFrame = 2048
 [RemoteAdmin]
    enabled = false
author	ubit	2012-08-04 11:42:59 +0200
committer	ubit	2012-08-04 11:42:59 +0200
commit	dfb77330a8f5abac2acd72db196d1020a25697c1 (patch)
tree	8be49aa7fb6917cd5feeb4b7246d416bcc41d06a /bin/OpenSimDefaults.ini
parent	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent	update ode.dll for windows so both 32b and 64b are now version 0.12 (32b (diff)
download	opensim-SC_OLD-dfb77330a8f5abac2acd72db196d1020a25697c1.zip opensim-SC_OLD-dfb77330a8f5abac2acd72db196d1020a25697c1.tar.gz opensim-SC_OLD-dfb77330a8f5abac2acd72db196d1020a25697c1.tar.bz2 opensim-SC_OLD-dfb77330a8f5abac2acd72db196d1020a25697c1.tar.xz

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