Merge branch 'master' into httptests

2 files changed, 11 insertions, 8 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 36dae35..1d90469 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -927,7 +927,7 @@
     ;; The trade-off may be increased memory usage by the script engine.
     ; ThreadStackSize = 262144
 
-    ;; Set this to true (the default) to load each script into a separate
+    ;; Set this to true to load each script into a separate
     ;; AppDomain. 
     ;;
     ;; Setting this to false will load all script assemblies into the
@@ -936,8 +936,10 @@
     ;;
     ;; However, setting this to false will also prevent script DLLs from being unloaded from memory if the script is deleted.
     ;; This may cause an OutOfMemory problem over time when avatars with scripted attachments move in and out of the region.
-    ;; Some Windows users have also reported script loading problems when AppDomainLoading = false
-    ; AppDomainLoading = true
+    ;; at this time some mono versions seem to have problems with the true option
+    ;; so default is now false until a fix is found, to simply life of less technical skilled users.
+    ;; this should only be a issue if regions stay alive for a long time with lots of scripts added or edited.
+    ; AppDomainLoading = false
 
     ;; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op) 
     ;; co-op will be more stable but this option is currently experimental.
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index bd37748..f10596e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1693,12 +1693,13 @@
     ; Stack size per thread created
     ThreadStackSize = 262144
 
-    ; Set this to true (the default) to load each script into a separate
+    ; Set this to true to load each script into a separate
     ; AppDomain. Setting this to false will load all script assemblies into the
-    ; current AppDomain, which will reduce the per-script overhead at the
-    ; expense of reduced security and the inability to garbage collect the
-    ; script assemblies
-    AppDomainLoading = true
+    ; current AppDomain, which will reduce the per-script overhead but deleted scripts stay inactive using memory
+    ; this may only be a problem if regions stay alive for a long time with lots of scripts added or edited.
+    ; at this time some mono versions seem to have problems with the true option
+    ; so default is now false until a fix is found
+    AppDomainLoading = false
 
     ; 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