aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example
diff options
context:
space:
mode:
authorUbitUmarov2016-10-21 17:58:17 +0100
committerUbitUmarov2016-10-21 17:58:17 +0100
commit2ce0673af25901564060edab9e9ce67bbcc7c914 (patch)
treeeae37a850319184ea16c30ffb8b62cf950423f1b /bin/OpenSim.ini.example
parentMerge branch 'master' into httptests (diff)
parentignore prims with shape type none on max size check for physics (diff)
downloadopensim-SC-2ce0673af25901564060edab9e9ce67bbcc7c914.zip
opensim-SC-2ce0673af25901564060edab9e9ce67bbcc7c914.tar.gz
opensim-SC-2ce0673af25901564060edab9e9ce67bbcc7c914.tar.bz2
opensim-SC-2ce0673af25901564060edab9e9ce67bbcc7c914.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to 'bin/OpenSim.ini.example')
-rw-r--r--bin/OpenSim.ini.example8
1 files changed, 5 insertions, 3 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 @@
927 ;; The trade-off may be increased memory usage by the script engine. 927 ;; The trade-off may be increased memory usage by the script engine.
928 ; ThreadStackSize = 262144 928 ; ThreadStackSize = 262144
929 929
930 ;; Set this to true (the default) to load each script into a separate 930 ;; Set this to true to load each script into a separate
931 ;; AppDomain. 931 ;; AppDomain.
932 ;; 932 ;;
933 ;; Setting this to false will load all script assemblies into the 933 ;; Setting this to false will load all script assemblies into the
@@ -936,8 +936,10 @@
936 ;; 936 ;;
937 ;; However, setting this to false will also prevent script DLLs from being unloaded from memory if the script is deleted. 937 ;; However, setting this to false will also prevent script DLLs from being unloaded from memory if the script is deleted.
938 ;; This may cause an OutOfMemory problem over time when avatars with scripted attachments move in and out of the region. 938 ;; This may cause an OutOfMemory problem over time when avatars with scripted attachments move in and out of the region.
939 ;; Some Windows users have also reported script loading problems when AppDomainLoading = false 939 ;; at this time some mono versions seem to have problems with the true option
940 ; AppDomainLoading = true 940 ;; so default is now false until a fix is found, to simply life of less technical skilled users.
941 ;; this should only be a issue if regions stay alive for a long time with lots of scripts added or edited.
942 ; AppDomainLoading = false
941 943
942 ;; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op) 944 ;; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op)
943 ;; co-op will be more stable but this option is currently experimental. 945 ;; co-op will be more stable but this option is currently experimental.