aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorMelanie2012-08-11 17:32:30 +0100
committerMelanie2012-08-11 17:32:30 +0100
commit93e3ab3ebd81e4a8d588e49d5486903867cf0257 (patch)
tree1f1389187afd43439b8274b16912c2fee5b654b6 /bin/OpenSimDefaults.ini
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'bulletsim7' (diff)
downloadopensim-SC-93e3ab3ebd81e4a8d588e49d5486903867cf0257.zip
opensim-SC-93e3ab3ebd81e4a8d588e49d5486903867cf0257.tar.gz
opensim-SC-93e3ab3ebd81e4a8d588e49d5486903867cf0257.tar.bz2
opensim-SC-93e3ab3ebd81e4a8d588e49d5486903867cf0257.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 45d5090..2571669 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -939,7 +939,7 @@
939 FixedTimeStep = .01667 939 FixedTimeStep = .01667
940 940
941 MaxCollisionsPerFrame = 2048 941 MaxCollisionsPerFrame = 2048
942 MaxUpdatesPerFrame = 2048 942 MaxUpdatesPerFrame = 8192
943 943
944[RemoteAdmin] 944[RemoteAdmin]
945 enabled = false 945 enabled = false