Merge branch 'master' into bulletsim

1 files changed, 13 insertions, 4 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index d487ce6..2877541 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
@@ -77,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
@@ -170,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
 
@@ -1403,6 +1408,10 @@
     ; 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