Merge branch 'master' into bulletsim

1 files changed, 13 insertions, 3 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 2fe4db7..bcfaf76 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -39,6 +39,9 @@
     ;# {save_crashes} {} {Save crashes to disk?} {true false} false
     ;; 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
 
     ;# {crash_dir} {save_crashes:true} {Directory to save crashes to?} {} crashes
@@ -80,9 +83,11 @@
     ;; This can be overriden in the region config file.
     ; ClampPrimSize = false
 
-    ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} 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
+    ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true
+    ;; 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
 
     ;# {TrustBinaries} {AllowScriptCrossing:true} {Accept compiled binary script code? (DANGEROUS!)} {true false} false
     ;; Allow compiled script binary code to cross region boundaries.
@@ -711,6 +716,11 @@
     ; Enabled = true;
 
 
+[NPC]
+    ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false
+    ; Enabled = false
+
+
 [PrimLimitsModule]
     ;# {EnforcePrimLimits} {} {Enforce parcel prim limits} {true false} false
     ;; Enable parcel prim limits.  Off by default to emulate pre-existing behavior.