diff options
| author | Melanie | 2013-01-16 01:13:14 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-16 01:13:14 +0000 |
| commit | 70fa41863d1f2291d439592682b8d9fa78fa0f06 (patch) | |
| tree | 623b693af0ceec2e5b0cda8d265b8139c757627b /bin | |
| parent | Merge commit '7978b349bd400d14b7ecd4f8274af1921f435fee' into careminster (diff) | |
| parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
| download | opensim-SC_OLD-70fa41863d1f2291d439592682b8d9fa78fa0f06.zip opensim-SC_OLD-70fa41863d1f2291d439592682b8d9fa78fa0f06.tar.gz opensim-SC_OLD-70fa41863d1f2291d439592682b8d9fa78fa0f06.tar.bz2 opensim-SC_OLD-70fa41863d1f2291d439592682b8d9fa78fa0f06.tar.xz | |
Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster
Diffstat (limited to 'bin')
| -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 12474a7..85f7708 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -925,18 +925,10 @@ | |||
| 925 | 925 | ||
| 926 | MaxObjectMass = 10000.01 | 926 | MaxObjectMass = 10000.01 |
| 927 | 927 | ||
| 928 | ; Dynamic parameters | ||
| 929 | LinearDamping = 0.0 | ||
| 930 | AngularDamping = 0.0 | ||
| 931 | DeactivationTime = 0.2 | ||
| 932 | CollisionMargin = 0.04 | 928 | CollisionMargin = 0.04 |
| 933 | 929 | ||
| 934 | ; Linkset constraint parameters | 930 | ; Linkset constraint parameters |
| 935 | LinkImplementation = 1 ; 0=constraint, 1=compound | 931 | LinkImplementation = 1 ; 0=constraint, 1=compound |
| 936 | LinkConstraintUseFrameOffset = False | ||
| 937 | LinkConstraintEnableTransMotor = True | ||
| 938 | LinkConstraintTransMotorMaxVel = 5.0 | ||
| 939 | LinkConstraintTransMotorMaxForce = 0.1 | ||
| 940 | 932 | ||
| 941 | ; Whether to mesh sculpties | 933 | ; Whether to mesh sculpties |
| 942 | MeshSculptedPrim = true | 934 | MeshSculptedPrim = true |