1 files changed, 24 insertions, 32 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 54f252e..85f7708 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -217,10 +217,10 @@
     ; to false if you have compatibility problems.
     ;CacheSculptMaps = true
     
-    ; Choose one of the physics engines below
-    ; OpenDynamicsEngine is by some distance the most developed physics engine
-    ; basicphysics effectively does not model physics at all, making all objects phantom
-
+    ; Choose one of the physics engines below.
+    ; OpenDynamicsEngine is by some distance the most developed physics engine.
+    ; BulletSim is a high performance, up-and-coming physics engine.
+    ; basicphysics effectively does not model physics at all, making all objects phantom.
     physics = OpenDynamicsEngine
     ;physics = basicphysics
     ;physics = POS
@@ -364,6 +364,12 @@
     ; alert_uri = "http://myappserver.net/my_handler/"
 
 
+[EstateManagement]
+    ; If false, then block any region restart requests from the client even if they are otherwise valid.
+    ; Default is true
+    AllowRegionRestartFromClient = true
+
+
 [SMTP]
     enabled = false
 
@@ -898,17 +904,20 @@
 
 [BulletSim]
     ; World parameters
-    DefaultFriction = 0.50
+    DefaultFriction = 0.20
     DefaultDensity = 10.000006836
     DefaultRestitution = 0.0
     Gravity = -9.80665
 
-    TerrainFriction = 0.50
-    TerrainHitFriction = 0.8
+    TerrainFriction = 0.30
+    TerrainHitFraction = 0.8
     TerrainRestitution = 0
+    TerrainCollisionMargin = 0.04
+
     AvatarFriction = 0.2
+    AvatarStandingFriction = 10.0
     AvatarRestitution = 0.0
-    AvatarDensity = 60.0
+    AvatarDensity = 3.5
     AvatarCapsuleWidth = 0.6
     AvatarCapsuleDepth = 0.45
     AvatarCapsuleHeight = 1.5
@@ -916,30 +925,10 @@
 
     MaxObjectMass = 10000.01
 
-    ; Dynamic parameters
-    LinearDamping = 0.0
-    AngularDamping = 0.0
-    DeactivationTime = 0.2
-    LinearSleepingThreshold = 0.8
-    AngularSleepingThreshold = 1.0
-    CcdMotionThreshold = 0.0
-    CcdSweptSphereRadius = 0.0
-    ContactProcessingThreshold = 0.1
-    ; If setting a pool size, also disable dynamic allocation (default pool size is 4096 with dynamic alloc)
-    MaxPersistantManifoldPoolSize = 0
-    ShouldDisableContactPoolDynamicAllocation = False
-    ShouldForceUpdateAllAabbs = False
-    ShouldRandomizeSolverOrder = True
-    ShouldSplitSimulationIslands = True
-    ShouldEnableFrictionCaching = False
-    NumberOfSolverIterations = 0   
+    CollisionMargin = 0.04
 
     ; Linkset constraint parameters
-    LinkConstraintUseFrameOffset = False
-    LinkConstraintEnableTransMotor = True
-    LinkConstraintTransMotorMaxVel = 5.0
-    LinkConstraintTransMotorMaxForce = 0.1
-
+    LinkImplementation = 1      ; 0=constraint, 1=compound
 
     ; Whether to mesh sculpties
     MeshSculptedPrim = true
@@ -1367,6 +1356,10 @@
     ; If a script overruns it's event limit, kill the script?
     KillTimedOutScripts = false
 
+    ; Amount of time in milliseconds we will wait for an event to completely normally when a script stop is requested
+    ; before aborting the thread (such as when an object containing scripts is taken into inventory).
+    WaitForEventCompletionOnScriptStop = 1000;
+
     ; Sets the multiplier for the scripting delays
     ScriptDelayFactor = 1.0
 
@@ -1582,8 +1575,7 @@
 
     ; If true, then the basic packet objects used to receive data are also recycled, not just the LLUDP packets.
     ; This reduces data churn
-    ; This setting is currently experimental and defaults to false.
-    RecycleBaseUDPPackets = false;
+    RecycleBaseUDPPackets = true
 
 
 [InterestManagement]