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

7 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
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
new file mode 100755
index 0000000..03e8f26
--- /dev/null
+++ b/bin/lib32/BulletSim.dll
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
new file mode 100755
index 0000000..4e119c4
--- /dev/null
+++ b/bin/lib32/libBulletSim.so
diff --git a/bin/lib32/ode.dll b/bin/lib32/ode.dll
index 90106ca..c3263ae 100755
--- a/bin/lib32/ode.dll
+++ b/bin/lib32/ode.dll
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
new file mode 100755
index 0000000..6e8d6b4
--- /dev/null
+++ b/bin/lib64/BulletSim.dll
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
new file mode 100755
index 0000000..9363d1a
--- /dev/null
+++ b/bin/lib64/libBulletSim.so
diff --git a/bin/lib64/ode.dll b/bin/lib64/ode.dll
index df3a6c4..6f5b504 100755
--- a/bin/lib64/ode.dll
+++ b/bin/lib64/ode.dll