diff options
author | UbitUmarov | 2016-11-03 14:01:35 +0000 |
---|---|---|
committer | UbitUmarov | 2016-11-03 14:01:35 +0000 |
commit | 01a4a883e08f681c48fbb3d456a773f93985f694 (patch) | |
tree | 30a9aef2876644413e56e22ff50088904bab8e53 /bin | |
parent | Merge branch 'master' into httptests (diff) | |
parent | fix some coments, thanks Austin Tate (diff) | |
download | opensim-SC-01a4a883e08f681c48fbb3d456a773f93985f694.zip opensim-SC-01a4a883e08f681c48fbb3d456a773f93985f694.tar.gz opensim-SC-01a4a883e08f681c48fbb3d456a773f93985f694.tar.bz2 opensim-SC-01a4a883e08f681c48fbb3d456a773f93985f694.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSim.ini.example | 7 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 25 |
2 files changed, 24 insertions, 8 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 1d90469..7d74fe3 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -958,6 +958,13 @@ | |||
958 | ;; by scripts have changed. | 958 | ;; by scripts have changed. |
959 | ; DeleteScriptsOnStartup = true | 959 | ; DeleteScriptsOnStartup = true |
960 | 960 | ||
961 | ;# {CompactMemOnLoad} {} {compacts memory on each script load at startup?} {true false} false | ||
962 | ;; forces calls to memory garbage collector before loading each script DLL during region startup. | ||
963 | ;; Peak memory usage is reduced and region starts with a more compacted memory allocation. | ||
964 | ;; But this costs a lot of time, so region load will take a lot longer. | ||
965 | ;; it is more usefull if there are no previously compiled scripts DLLs (as with DeleteScriptsOnStartup = true) | ||
966 | ;CompactMemOnLoad = false | ||
967 | |||
961 | ;# {DefaultCompileLanguage} {Enabled:true} {Default script language?} {lsl vb cs} lsl | 968 | ;# {DefaultCompileLanguage} {Enabled:true} {Default script language?} {lsl vb cs} lsl |
962 | ;; Default language for scripts | 969 | ;; Default language for scripts |
963 | ; DefaultCompileLanguage = "lsl" | 970 | ; DefaultCompileLanguage = "lsl" |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index f10596e..fd5fa0e 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -1699,14 +1699,23 @@ | |||
1699 | ; this may only be a problem if regions stay alive for a long time with lots of scripts added or edited. | 1699 | ; this may only be a problem if regions stay alive for a long time with lots of scripts added or edited. |
1700 | ; at this time some mono versions seem to have problems with the true option | 1700 | ; at this time some mono versions seem to have problems with the true option |
1701 | ; so default is now false until a fix is found | 1701 | ; so default is now false until a fix is found |
1702 | AppDomainLoading = false | 1702 | ; AppDomainLoading = false |
1703 | 1703 | ||
1704 | ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false | 1704 | ; Controls whether previously compiled scripts DLLs are deleted on sim restart. |
1705 | ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the | 1705 | ; If you set this to false then startup will be considerably faster since scripts won't need to be recompiled. |
1706 | ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used | 1706 | ; It should be true on first run after updating opensim binary version |
1707 | ; by scripts have changed. | 1707 | ; after first run you can change to false. |
1708 | ; DeleteScriptsOnStartup = false | 1708 | ; You can also set it to false and delete the script DLLs by hand |
1709 | 1709 | ; This does not delete cached scripts state. | |
1710 | ; DeleteScriptsOnStartup = true | ||
1711 | |||
1712 | ; CompactMemOnLoad | ||
1713 | ; forces calls to memory garbage collector before loading each script DLL during region startup. | ||
1714 | ; Peak memory usage is reduced and region starts with a more compacted memory allocation. | ||
1715 | ; But this costs a lot of time, so region load will take a lot longer. | ||
1716 | ; it is more usefull if there are no previously compiled scripts DLLs (or DeleteScriptsOnStartup = true) | ||
1717 | ; CompactMemOnLoad = false | ||
1718 | |||
1710 | ; Controls whether scripts are stopped by aborting their threads externally (abort) | 1719 | ; Controls whether scripts are stopped by aborting their threads externally (abort) |
1711 | ; or by co-operative checks inserted by OpenSimulator into compiled script (co-op). | 1720 | ; or by co-operative checks inserted by OpenSimulator into compiled script (co-op). |
1712 | ; co-op will be more stable as aborting threads can cause instability. | 1721 | ; co-op will be more stable as aborting threads can cause instability. |