diff options
author | Justin Clark-Casey (justincc) | 2013-01-16 00:18:59 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-16 00:20:18 +0000 |
commit | 03a8a4426fddd05418309958cbbc2966cdad75e5 (patch) | |
tree | 2cabd553d5fb898fcfd52c396ab6dd850d504c96 /bin/OpenSimDefaults.ini | |
parent | Implement co-operative script termination if termination comes during a scrip... (diff) | |
parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
download | opensim-SC-03a8a4426fddd05418309958cbbc2966cdad75e5.zip opensim-SC-03a8a4426fddd05418309958cbbc2966cdad75e5.tar.gz opensim-SC-03a8a4426fddd05418309958cbbc2966cdad75e5.tar.bz2 opensim-SC-03a8a4426fddd05418309958cbbc2966cdad75e5.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r-- | bin/OpenSimDefaults.ini | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 74bae01..45c3d40 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -929,18 +929,10 @@ | |||
929 | 929 | ||
930 | MaxObjectMass = 10000.01 | 930 | MaxObjectMass = 10000.01 |
931 | 931 | ||
932 | ; Dynamic parameters | ||
933 | LinearDamping = 0.0 | ||
934 | AngularDamping = 0.0 | ||
935 | DeactivationTime = 0.2 | ||
936 | CollisionMargin = 0.04 | 932 | CollisionMargin = 0.04 |
937 | 933 | ||
938 | ; Linkset constraint parameters | 934 | ; Linkset constraint parameters |
939 | LinkImplementation = 1 ; 0=constraint, 1=compound | 935 | LinkImplementation = 1 ; 0=constraint, 1=compound |
940 | LinkConstraintUseFrameOffset = False | ||
941 | LinkConstraintEnableTransMotor = True | ||
942 | LinkConstraintTransMotorMaxVel = 5.0 | ||
943 | LinkConstraintTransMotorMaxForce = 0.1 | ||
944 | 936 | ||
945 | ; Whether to mesh sculpties | 937 | ; Whether to mesh sculpties |
946 | MeshSculptedPrim = true | 938 | MeshSculptedPrim = true |