1 files changed, 87 insertions, 19 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 5aeadce..ca4fbfb 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -5,6 +5,9 @@
 [Startup]
     ; Set this to true if you want to log crashes to disk
     ; this can be useful when submitting bug reports.
+    ; However, this will only log crashes within OpenSimulator that cause the entire program to exit
+    ; It will not log crashes caused by virtual machine failures, which includes mono and ODE failures.
+    ; You will need to capture these native stack traces by recording the session log itself.
     save_crashes = false
 
     ; Directory to save crashes to if above is enabled
@@ -67,12 +70,6 @@
     ; except that everything is also enclosed in a <Regions> tag.
     ; regionload_webserver_url = "http://example.com/regions.xml";
 
-    ; Draw objects on maptile.  This step might take a long time if you've got a large number of
-    ; objects, so you can turn it off here if you'd like.
-    DrawPrimOnMapTile = true
-    ; Use terrain texture for maptiles if true, use shaded green if false
-    TextureOnMapTile = false
-
     ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonphysicalPrimMax!).
     NonPhysicalPrimMax = 256
 
@@ -83,8 +80,10 @@
     ; This can be overriden in the region config file.
     ClampPrimSize = false
 
-    ; Allow scripts to keep running when they cross region boundaries, rather than being restarted.  Script code is recompiled on the destination region and the state reloaded.
-    AllowScriptCrossing = false
+    ; Allow scripts to keep running when they cross region boundaries, rather than being restarted.  State is reloaded on the destination region.
+    ; This only applies when crossing to a region running in a different simulator.  
+    ; For crossings where the regions are on the same simulator the script is always kept running.
+    AllowScriptCrossing = true
 
     ; Allow compiled script binary code to cross region boundaries.
     ; If you set this to "true", any region that can teleport to you can
@@ -165,6 +164,7 @@
     ;physics = basicphysics
     ;physics = POS
     ;physics = modified_BulletX
+    ;physics = BulletSim
 
     ; ##
     ; ## PERMISSIONS
@@ -175,8 +175,8 @@
     ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
     ; any item, etc.  This may not yet be implemented uniformally.
     ; If set to true, then all permissions checks are carried out
-    ; Default is false
-    serverside_object_permissions = false
+    ; Default is true
+    serverside_object_permissions = true
 
     allow_grid_gods = false
 
@@ -216,13 +216,26 @@
 
     ;WorldMapModule = "WorldMap"
     ;MapImageModule = "MapImageModule"
+
+    ; World map blacklist timeout in seconds
+    ;BlacklistTimeout = 600
+
     ; Set to false to not generate any maptiles
-    ;GenerateMaptiles = "true"
+    ;GenerateMaptiles = true
+
     ; Refresh (in seconds) the map tile periodically
     ;MaptileRefresh = 0
+
     ; If not generating maptiles, use this static texture asset ID
     ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
 
+    ; Draw objects on maptile.  This step might take a long time if you've got a large number of
+    ; objects, so you can turn it off here if you'd like.
+    DrawPrimOnMapTile = true
+
+    ; Use terrain texture for maptiles if true, use shaded green if false
+    TextureOnMapTile = true
+
     ; ##
     ; ## EMAIL MODULE
     ; ##
@@ -273,15 +286,15 @@
 
 
 [SMTP]
-    enabled=false
+    enabled = false
 
-    ;enabled=true
-    ;internal_object_host=lsl.opensim.local
-    ;host_domain_header_from=127.0.0.1
-    ;SMTP_SERVER_HOSTNAME=127.0.0.1
-    ;SMTP_SERVER_PORT=25
-    ;SMTP_SERVER_LOGIN=foo
-    ;SMTP_SERVER_PASSWORD=bar
+    ;enabled = true
+    ;internal_object_host = lsl.opensim.local
+    ;host_domain_header_from = 127.0.0.1
+    ;SMTP_SERVER_HOSTNAME = 127.0.0.1
+    ;SMTP_SERVER_PORT = 25
+    ;SMTP_SERVER_LOGIN = foo
+    ;SMTP_SERVER_PASSWORD = bar
 
 
 [Network]
@@ -721,6 +734,49 @@
     ; true. Note that this will increase memory usage and region startup time. Default is false.
     ;force_simple_prim_meshing = true
 
+[BulletSim]
+    ; World parameters
+    DefaultFriction = 0.50
+    DefaultDensity = 10.000006836
+    DefaultRestitution = 0.0
+    Gravity = -9.80665
+
+    TerrainFriction = 0.50
+    TerrainHitFriction = 0.8
+    TerrainRestitution = 0
+    AvatarFriction = 0
+    AvatarDensity = 60.0
+    AvatarCapsuleRadius = 0.37
+    AvatarCapsuleHeight = 1.5
+
+    MaxObjectMass = 10000.01
+
+    ; Dynamic parameters
+    LinearDamping = 0.0
+    AngularDamping = 0.0
+    DeactivationTime = 0.2
+    LinearSleepingThreshold = 0.8
+    AngularSleepingThreshold = 1.0
+    CcdMotionThreshold = 0.5
+    CcdSweptSphereRadius = 0.2
+
+    ; Whether to mesh sculpties
+    MeshSculptedPrim = true
+
+    ; If 'true', force simple prims (box and sphere) to be meshed
+    ForceSimplePrimMeshing = false
+
+    ; level of detail for physical meshes. 32,16,8 or 4 with 32 being full detail
+    MeshLevelOfDetail = 8
+    ; number^2 non-physical level of detail of the sculpt texture.  32x32 - 1024 verticies
+    SculptLevelOfDetail = 32
+
+    ; Bullet step parameters
+    MaxSubSteps = 10;
+    FixedTimeStep = .01667
+
+    MaxCollisionsPerFrame = 2048
+    MaxUpdatesPerFrame = 2048
 
 [RemoteAdmin]
     enabled = false
@@ -1357,6 +1413,18 @@
     ; Enable media on a prim facilities
     Enabled = true;
 
+[NPC]
+    ;; Enable Non Player Character (NPC) facilities
+    Enabled = false
+
+;; 
+;; If you are using a simian grid frontend you can enable
+;; this module to upload tile images for the mapping fn
+;;
+[SimianGridMaptiles]
+    Enabled = False
+    MaptileURL = "http://www.mygrid.com/Grid/"
+    RefreshTime = 3600
 
 ;;
 ;; These are defaults that are overwritten below in [Architecture].