aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--bin/OpenSim.ini.example24
-rw-r--r--bin/OpenSimDefaults.ini20
2 files changed, 31 insertions, 13 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"
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 45c3d40..391fb0c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1290,6 +1290,20 @@
1290 ; script assemblies 1290 ; script assemblies
1291 AppDomainLoading = true 1291 AppDomainLoading = true
1292 1292
1293 ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
1294 ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
1295 ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
1296 ; by scripts have changed.
1297 ; DeleteScriptsOnStartup = false
1298
1299 ; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op)
1300 ; co-op will be more stable but this option is currently experimental.
1301 ; If moving from co-op to abort, existing script DLLs will need to be recompiled.
1302 ; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run
1303 ; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
1304 ; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
1305 ScriptStopStrategy = abort
1306
1293 ; Rate to poll for asynchronous command replies (ms) 1307 ; Rate to poll for asynchronous command replies (ms)
1294 ; currently unused 1308 ; currently unused
1295 ;AsyncLLCommandLoopms = 50 1309 ;AsyncLLCommandLoopms = 50
@@ -1391,12 +1405,6 @@
1391 ;; Path to script assemblies 1405 ;; Path to script assemblies
1392 ; ScriptEnginesPath = "ScriptEngines" 1406 ; ScriptEnginesPath = "ScriptEngines"
1393 1407
1394 ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
1395 ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
1396 ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
1397 ; by scripts have changed.
1398 ; DeleteScriptsOnStartup = false
1399
1400 1408
1401[Concierge] 1409[Concierge]
1402 ; Enable concierge module 1410 ; Enable concierge module