aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--bin/OpenSim.ini.example6
-rw-r--r--bin/OpenSimDefaults.ini11
2 files changed, 10 insertions, 7 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 3fe3992..8fc608d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -903,8 +903,10 @@
903 ;; 903 ;;
904 ;; However, setting this to false will also prevent script DLLs from being unloaded from memory if the script is deleted. 904 ;; However, setting this to false will also prevent script DLLs from being unloaded from memory if the script is deleted.
905 ;; This may cause an OutOfMemory problem over time when avatars with scripted attachments move in and out of the region. 905 ;; This may cause an OutOfMemory problem over time when avatars with scripted attachments move in and out of the region.
906 ;; Some Windows users have also reported script loading problems when AppDomainLoading = false 906 ;; at this time some mono versions seem to have problems with the true option
907 ; AppDomainLoading = true 907 ;; so default is now false until a fix is found, to simply life of less technical skilled users.
908 ;; this should only be a issue if regions stay alive for a long time with lots of scripts added or edited.
909 ; AppDomainLoading = false
908 910
909 ;; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op) 911 ;; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op)
910 ;; co-op will be more stable but this option is currently experimental. 912 ;; co-op will be more stable but this option is currently experimental.
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 77ba3c8..e846e73 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1690,12 +1690,13 @@
1690 ; Stack size per thread created 1690 ; Stack size per thread created
1691 ThreadStackSize = 262144 1691 ThreadStackSize = 262144
1692 1692
1693 ; Set this to true (the default) to load each script into a separate 1693 ; Set this to true to load each script into a separate
1694 ; AppDomain. Setting this to false will load all script assemblies into the 1694 ; AppDomain. Setting this to false will load all script assemblies into the
1695 ; current AppDomain, which will reduce the per-script overhead at the 1695 ; current AppDomain, which will reduce the per-script overhead but deleted scripts stay inactive using memory
1696 ; expense of reduced security and the inability to garbage collect the 1696 ; this may only be a problem if regions stay alive for a long time with lots of scripts added or edited.
1697 ; script assemblies 1697 ; at this time some mono versions seem to have problems with the true option
1698 AppDomainLoading = true 1698 ; so default is now false until a fix is found
1699 AppDomainLoading = false
1699 1700
1700 ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false 1701 ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
1701 ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the 1702 ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the