Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmerge

avinationmerge
Melanie 2011-10-12 01:29:31 +01:00
commit e3f6344f54
2 changed files with 8 additions and 9 deletions

View File

@ -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

View File

@ -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]