diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 2fe4db7d26..e3b127f406 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -80,9 +80,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.
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index a7e40db312..b689f88900 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -77,8 +77,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