1 files changed, 63 insertions, 38 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 54f252e..fa88146 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,33 @@
 
 [BulletSim]
     ; World parameters
-    DefaultFriction = 0.50
+
+    ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll
+    ; bulletxna is a managed C# dll.  They have comparible functionality..   the c++ is much faster.
+
+    BulletEngine = "bulletunmanaged"
+    ; BulletEngine = "bulletxna"
+
+    ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain.  If you're using the bulletxna engine, 
+    ;  you will want to switch to the heightfield option
+
+    TerrainImplementation = 1
+    ; TerrainImplementation = 0
+
+    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 +938,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
@@ -966,6 +968,7 @@
     PhysicsLoggingEnabled = False
     PhysicsLoggingDir = "."
     VehicleLoggingEnabled = False
+    
 
 [RemoteAdmin]
     enabled = false
@@ -1116,6 +1119,17 @@
 
     ;exclude_list=User 1,User 2,User 3
 
+    ;;Shows modal alertbox for entering agent on IRC enabled regions
+    ;;
+    ;; Enable Alert, default = false
+    ;alert_show = false
+    ;;
+    ;; Show IRC serverinfo, default = true
+    ;alert_show_serverinfo = true
+    ;;
+    ;alert_msg_pre = "This region is linked to Irc."
+    ;alert_msg_post = "Everything you say in public chat can be listened."
+
 
 ; The following settings control the progression of daytime
 ; in the Sim.  The defaults are the same as the commented out settings
@@ -1297,6 +1311,20 @@
     ; script assemblies
     AppDomainLoading = true
 
+    ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
+    ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the 
+    ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
+    ; by scripts have changed.
+    ; DeleteScriptsOnStartup = false
+
+    ; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op) 
+    ; co-op will be more stable but this option is currently experimental.
+    ; If moving from co-op to abort, existing script DLLs will need to be recompiled.
+    ; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run 
+    ; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
+    ; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
+    ScriptStopStrategy = abort
+
     ; Rate to poll for asynchronous command replies (ms)
     ; currently unused
     ;AsyncLLCommandLoopms = 50
@@ -1367,6 +1395,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
 
@@ -1394,12 +1426,6 @@
     ;; Path to script assemblies 
     ; ScriptEnginesPath = "ScriptEngines"
 
-    ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
-    ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the 
-    ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
-    ; by scripts have changed.
-    ; DeleteScriptsOnStartup = false
-
 
 [Concierge]
     ; Enable concierge module
@@ -1582,8 +1608,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]