diff options
| author | Melanie | 2011-10-12 01:29:31 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-12 01:29:31 +0100 |
| commit | e3f6344f54eece983578a475506db6585c866d52 (patch) | |
| tree | ed85a641c65808014b927d87dfbdebe58f671c07 | |
| parent | Fix rezzing coalesced object broken by core merge (diff) | |
| parent | Clarify explanation of DeleteScriptsOnStartup switch in [XEngine]. (diff) | |
| download | opensim-SC-e3f6344f54eece983578a475506db6585c866d52.zip opensim-SC-e3f6344f54eece983578a475506db6585c866d52.tar.gz opensim-SC-e3f6344f54eece983578a475506db6585c866d52.tar.bz2 opensim-SC-e3f6344f54eece983578a475506db6585c866d52.tar.xz | |
Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmerge
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenSim.ini.example | 10 | ||||
| -rw-r--r-- | bin/OpenSimDefaults.ini | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index c3d3216..40612e9 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -223,11 +223,11 @@ | |||
| 223 | ;; server to send mail through. | 223 | ;; server to send mail through. |
| 224 | ; emailmodule = DefaultEmailModule | 224 | ; emailmodule = DefaultEmailModule |
| 225 | 225 | ||
| 226 | ; Controls whether previously compiled scripts are deleted on sim restart. If you disable this | 226 | ;# {DeleteScriptsOnRestart} {} {Delete compiled script DLLs on restart?} (true false) true |
| 227 | ; then startup will be faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the | 227 | ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false |
| 228 | ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used | 228 | ;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the |
| 229 | ; by scripts have changed. | 229 | ;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used |
| 230 | ; Default is false | 230 | ;; by scripts have changed. |
| 231 | ; DeleteScriptsOnStartup = true | 231 | ; DeleteScriptsOnStartup = true |
| 232 | 232 | ||
| 233 | 233 | ||
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index cd69e2a..c4f5592 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1194,12 +1194,11 @@ | |||
| 1194 | ;; Path to script assemblies | 1194 | ;; Path to script assemblies |
| 1195 | ; ScriptEnginesPath = "ScriptEngines" | 1195 | ; ScriptEnginesPath = "ScriptEngines" |
| 1196 | 1196 | ||
| 1197 | ; Controls whether previously compiled scripts are deleted on sim restart. If you disable this | 1197 | ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false |
| 1198 | ; then startup will be faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the | 1198 | ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the |
| 1199 | ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used | 1199 | ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used |
| 1200 | ; by scripts have changed. | 1200 | ; by scripts have changed. |
| 1201 | ; Default is false | 1201 | ; DeleteScriptsOnStartup = false |
| 1202 | ; DeleteScriptsOnStartup = true | ||
| 1203 | 1202 | ||
| 1204 | 1203 | ||
| 1205 | [OpenGridProtocol] | 1204 | [OpenGridProtocol] |