diff options
author | Justin Clark-Casey (justincc) | 2013-01-23 23:57:09 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-23 23:57:09 +0000 |
commit | c51cae8fe81e26e7bb1cb5de1e3fdc505c01fb0a (patch) | |
tree | 9c38b5b1d57e0abb0b2238610d1ebe0738e910b2 /bin/OpenSim.ini.example | |
parent | Pass narrower WaitHandle rather than EventWaitHandle as co-op termination wai... (diff) | |
download | opensim-SC_OLD-c51cae8fe81e26e7bb1cb5de1e3fdc505c01fb0a.zip opensim-SC_OLD-c51cae8fe81e26e7bb1cb5de1e3fdc505c01fb0a.tar.gz opensim-SC_OLD-c51cae8fe81e26e7bb1cb5de1e3fdc505c01fb0a.tar.bz2 opensim-SC_OLD-c51cae8fe81e26e7bb1cb5de1e3fdc505c01fb0a.tar.xz |
Add information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini and OpenSim.ini.example. Default remains abort.
This setting controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op)
co-op should be more stable but this option is experimental.
If moving from co-op to abort, existing script DLLs will need to be recompiled.
This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run
or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSim.ini.example | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 658b993..0fe44e9 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -749,13 +749,6 @@ | |||
749 | ;; The trade-off may be increased memory usage by the script engine. | 749 | ;; The trade-off may be increased memory usage by the script engine. |
750 | ; ThreadStackSize = 262144 | 750 | ; ThreadStackSize = 262144 |
751 | 751 | ||
752 | ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) true | ||
753 | ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false | ||
754 | ;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the | ||
755 | ;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used | ||
756 | ;; by scripts have changed. | ||
757 | ; DeleteScriptsOnStartup = true | ||
758 | |||
759 | ;; Set this to true (the default) to load each script into a separate | 752 | ;; Set this to true (the default) to load each script into a separate |
760 | ;; AppDomain. | 753 | ;; AppDomain. |
761 | ;; | 754 | ;; |
@@ -768,6 +761,23 @@ | |||
768 | ;; Some Windows users have also reported script loading problems when AppDomainLoading = false | 761 | ;; Some Windows users have also reported script loading problems when AppDomainLoading = false |
769 | ; AppDomainLoading = true | 762 | ; AppDomainLoading = true |
770 | 763 | ||
764 | ;; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op) | ||
765 | ;; co-op will be more stable but this option is currently experimental. | ||
766 | ;; If moving from co-op to abort, existing script DLLs will need to be recompiled. | ||
767 | ;; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run | ||
768 | ;; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/ | ||
769 | ;; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile | ||
770 | ;; Current valid values are "abort" and "co-op" | ||
771 | ; ScriptStopStrategy = abort | ||
772 | |||
773 | |||
774 | ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) true | ||
775 | ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false | ||
776 | ;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the | ||
777 | ;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used | ||
778 | ;; by scripts have changed. | ||
779 | ; DeleteScriptsOnStartup = true | ||
780 | |||
771 | ;# {DefaultCompileLanguage} {Enabled:true} {Default script language?} {lsl vb cs} lsl | 781 | ;# {DefaultCompileLanguage} {Enabled:true} {Default script language?} {lsl vb cs} lsl |
772 | ;; Default language for scripts | 782 | ;; Default language for scripts |
773 | ; DefaultCompileLanguage = "lsl" | 783 | ; DefaultCompileLanguage = "lsl" |