diff options
| author | Justin Clark-Casey (justincc) | 2012-07-27 00:30:04 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-07-27 00:30:04 +0100 |
| commit | 5f741143fd328e8b13b512d9cc611178433eaef7 (patch) | |
| tree | 06f919ea81fdd26918f64fc50521b0dc0ffedd40 /bin | |
| parent | Fix issue where RegionCombinerModule was not removing regions from its dictio... (diff) | |
| parent | BulletSim: fix a recursive loop when fetching the mass of the root of a linkset. (diff) | |
| download | opensim-SC-5f741143fd328e8b13b512d9cc611178433eaef7.zip opensim-SC-5f741143fd328e8b13b512d9cc611178433eaef7.tar.gz opensim-SC-5f741143fd328e8b13b512d9cc611178433eaef7.tar.bz2 opensim-SC-5f741143fd328e8b13b512d9cc611178433eaef7.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 5935ca1..f92c555 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -915,7 +915,7 @@ | |||
| 915 | NumberOfSolverIterations = 0; | 915 | NumberOfSolverIterations = 0; |
| 916 | 916 | ||
| 917 | ; Linkset constraint parameters | 917 | ; Linkset constraint parameters |
| 918 | LinkConstraintUseFrameOffset = True; | 918 | LinkConstraintUseFrameOffset = False; |
| 919 | LinkConstraintEnableTransMotor = True; | 919 | LinkConstraintEnableTransMotor = True; |
| 920 | LinkConstraintTransMotorMaxVel = 5.0; | 920 | LinkConstraintTransMotorMaxVel = 5.0; |
| 921 | LinkConstraintTransMotorMaxForce = 0.1; | 921 | LinkConstraintTransMotorMaxForce = 0.1; |
| @@ -937,7 +937,7 @@ | |||
| 937 | FixedTimeStep = .01667 | 937 | FixedTimeStep = .01667 |
| 938 | 938 | ||
| 939 | MaxCollisionsPerFrame = 2048 | 939 | MaxCollisionsPerFrame = 2048 |
| 940 | MaxUpdatesPerFrame = 2048 | 940 | MaxUpdatesPerFrame = 8192 |
| 941 | 941 | ||
| 942 | [RemoteAdmin] | 942 | [RemoteAdmin] |
| 943 | enabled = false | 943 | enabled = false |