diff options
| author | Melanie | 2013-01-16 16:52:57 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-16 16:52:57 +0000 |
| commit | 9c99ed26ebe7cd2e42c10487e4ddfde0c934d921 (patch) | |
| tree | 536b2d6530fdda925203afddd27a4b9444e4d2a7 /bin | |
| parent | Complete removal of the now unused state queue (diff) | |
| parent | Changed a couple of debug messages at the request of osgrid. (diff) | |
| download | opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.zip opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.gz opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.bz2 opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -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 |