mirror of
https://github.com/opensim/opensim.git
synced 2026-08-11 03:45:35 +08:00
Merge branch 'master' into careminster
This commit is contained in:
@@ -846,10 +846,12 @@
|
||||
TerrainFriction = 0.50
|
||||
TerrainHitFriction = 0.8
|
||||
TerrainRestitution = 0
|
||||
AvatarFriction = 0
|
||||
AvatarFriction = 0.2
|
||||
AvatarRestitution = 0.0
|
||||
AvatarDensity = 60.0
|
||||
AvatarCapsuleRadius = 0.37
|
||||
AvatarCapsuleHeight = 1.5
|
||||
AvatarContactProcessingThreshold = 0.1;
|
||||
|
||||
MaxObjectMass = 10000.01
|
||||
|
||||
@@ -862,6 +864,14 @@
|
||||
CcdMotionThreshold = 0.0
|
||||
CcdSweptSphereRadius = 0.0
|
||||
ContactProcessingThreshold = 0.1
|
||||
MaxPersistantManifoldPoolSize = 0;
|
||||
ShouldDisableContactPoolDynamicAllocation = True;
|
||||
ShouldForceUpdateAllAabbs = False;
|
||||
ShouldRandomizeSolverOrder = False;
|
||||
ShouldSplitSimulationIslands = False;
|
||||
ShouldEnableFrictionCaching = False;
|
||||
NumberOfSolverIterations = 0;
|
||||
|
||||
|
||||
; Whether to mesh sculpties
|
||||
MeshSculptedPrim = true
|
||||
|
||||
Reference in New Issue
Block a user