Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2 files changed, 8 insertions, 9 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c3d3216..40612e9 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -223,11 +223,11 @@
     ;; 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
+    ;# {DeleteScriptsOnRestart} {} {Delete compiled script DLLs on restart?} (true false) true
+    ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
+    ;; then startup will be considerably 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.
     ; DeleteScriptsOnStartup = true
 
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index cd69e2a..c4f5592 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1194,12 +1194,11 @@
     ;; Path to script assemblies 
     ; ScriptEnginesPath = "ScriptEngines"
 
-    ; 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 
+    ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
+    ; then startup will be considerably 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
+    ; DeleteScriptsOnStartup = false
 
 
 [OpenGridProtocol]