aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorRobert Adams2013-01-23 16:23:11 -0800
committerRobert Adams2013-01-23 16:23:11 -0800
commit5b334079e0b3f93b616259210a12c590143f4f36 (patch)
treeb53e7c58b3c7d1f58c93b1e0818c432f9d273793 /bin
parentBulletSim: pass up and report the real collision penetration. (diff)
parentMerge branch 'master' into cooptermination (diff)
downloadopensim-SC_OLD-5b334079e0b3f93b616259210a12c590143f4f36.zip
opensim-SC_OLD-5b334079e0b3f93b616259210a12c590143f4f36.tar.gz
opensim-SC_OLD-5b334079e0b3f93b616259210a12c590143f4f36.tar.bz2
opensim-SC_OLD-5b334079e0b3f93b616259210a12c590143f4f36.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-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 889865b..c60579b 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1315,6 +1315,20 @@
1315 ; script assemblies 1315 ; script assemblies
1316 AppDomainLoading = true 1316 AppDomainLoading = true
1317 1317
1318 ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
1319 ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
1320 ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
1321 ; by scripts have changed.
1322 ; DeleteScriptsOnStartup = false
1323
1324 ; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op)
1325 ; co-op will be more stable but this option is currently experimental.
1326 ; If moving from co-op to abort, existing script DLLs will need to be recompiled.
1327 ; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run
1328 ; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
1329 ; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
1330 ScriptStopStrategy = abort
1331
1318 ; Rate to poll for asynchronous command replies (ms) 1332 ; Rate to poll for asynchronous command replies (ms)
1319 ; currently unused 1333 ; currently unused
1320 ;AsyncLLCommandLoopms = 50 1334 ;AsyncLLCommandLoopms = 50
@@ -1416,12 +1430,6 @@
1416 ;; Path to script assemblies 1430 ;; Path to script assemblies
1417 ; ScriptEnginesPath = "ScriptEngines" 1431 ; ScriptEnginesPath = "ScriptEngines"
1418 1432
1419 ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
1420 ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
1421 ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
1422 ; by scripts have changed.
1423 ; DeleteScriptsOnStartup = false
1424
1425 1433
1426[Concierge] 1434[Concierge]
1427 ; Enable concierge module 1435 ; Enable concierge module