Merge commit '53646070057c9355bba6df9e181253232d97d8e9' into bigmerge

2 files changed, 13 insertions, 5 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 925c343..57a2e06 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -218,6 +218,13 @@
     ;; server to send mail through.
     ; emailmodule = DefaultEmailModule
 
+    ; Controls whether previously compiled scripts are deleted on sim restart. If you disable this 
+    ; then startup will be 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.
+    ; Default is false
+    ; DeleteScriptsOnStartup = true
+
 
 [SMTP]
     ;; The SMTP server enabled the email module to send email to external
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ca4fbfb..f5d7f4a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1182,11 +1182,12 @@
     ;; Path to script assemblies 
     ; ScriptEnginesPath = "ScriptEngines"
 
-    ; Whether to delete previously compiled scripts when the sim starts. If you disable this
-    ; then startup will be faster. However, then it becomes your responsibility to delete the
-    ; compiled scripts if OpenSim has changed enough that previously compiled scripts are no
-    ; longer compatible.
-    DeleteScriptsOnStartup = true 
+    ; Controls whether previously compiled scripts are deleted on sim restart. If you disable this 
+    ; then startup will be 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.
+    ; Default is false
+    ; DeleteScriptsOnStartup = true
 
 
 [OpenGridProtocol]