diff options
author | Melanie | 2011-11-19 22:26:41 +0100 |
---|---|---|
committer | Melanie | 2011-11-19 22:26:41 +0100 |
commit | dec8b9c98dae977d6d9a94cc21d296f10957cf44 (patch) | |
tree | 27c5a94ae30b1acb7d0f0cd120f6060fb1ef5be2 /bin/OpenSimDefaults.ini | |
parent | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge (diff) | |
parent | Merge branch 'master' into bigmerge (diff) | |
download | opensim-SC-dec8b9c98dae977d6d9a94cc21d296f10957cf44.zip opensim-SC-dec8b9c98dae977d6d9a94cc21d296f10957cf44.tar.gz opensim-SC-dec8b9c98dae977d6d9a94cc21d296f10957cf44.tar.bz2 opensim-SC-dec8b9c98dae977d6d9a94cc21d296f10957cf44.tar.xz |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSimDefaults.ini | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 1c0af76..bf0a1c1 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -332,6 +332,26 @@ | |||
332 | DelayBeforeAppearanceSend = 2 | 332 | DelayBeforeAppearanceSend = 2 |
333 | 333 | ||
334 | 334 | ||
335 | [RegionReady] | ||
336 | ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled | ||
337 | enabled = true | ||
338 | |||
339 | ; Channel on which to signal region readiness through a message | ||
340 | ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]" | ||
341 | ; - the first field indicating whether this is an initial server startup | ||
342 | ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error) | ||
343 | ; - the third field is a number indicating how many scripts failed to compile | ||
344 | ; - "oar error" if supplied, provides the error message from the OAR load | ||
345 | channel_notify = -800 | ||
346 | |||
347 | ; - disallow logins while scripts are loading | ||
348 | ; Instability can occur on regions with 100+ scripts if users enter before they have finished loading | ||
349 | login_disable = true | ||
350 | |||
351 | ; - send an alert as json to a service | ||
352 | ; alert_uri = "http://myappserver.net/my_handler/" | ||
353 | |||
354 | |||
335 | [SMTP] | 355 | [SMTP] |
336 | enabled = false | 356 | enabled = false |
337 | 357 | ||
@@ -489,6 +509,7 @@ | |||
489 | ; | 509 | ; |
490 | ;DisableFacelights = "false" | 510 | ;DisableFacelights = "false" |
491 | 511 | ||
512 | |||
492 | [ClientStack.LindenCaps] | 513 | [ClientStack.LindenCaps] |
493 | ;; Long list of capabilities taken from | 514 | ;; Long list of capabilities taken from |
494 | ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities | 515 | ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities |
@@ -1098,15 +1119,18 @@ | |||
1098 | 1119 | ||
1099 | [Economy] | 1120 | [Economy] |
1100 | ; These economy values get used in the BetaGridLikeMoneyModule. - This module is for demonstration only - | 1121 | ; These economy values get used in the BetaGridLikeMoneyModule. - This module is for demonstration only - |
1122 | ; The default economy module only implements just enough to allow free actions (transfer of objects, etc). | ||
1123 | ; There is no intention to implement anything further in core OpenSimulator. | ||
1124 | ; This functionality has to be provided by third party modules. | ||
1101 | 1125 | ||
1102 | ; Enables selling things for $0 | 1126 | ;; Enables selling things for $0. Default is true. |
1103 | SellEnabled = "false" | 1127 | SellEnabled = true |
1104 | 1128 | ||
1105 | ; Money Unit fee to upload textures, animations etc | 1129 | ;; Money Unit fee to upload textures, animations etc. Default is 0. |
1106 | PriceUpload = 0 | 1130 | PriceUpload = 0 |
1107 | 1131 | ||
1108 | ; Money Unit fee to create groups | 1132 | ;; Money Unit fee to create groups. Default is 0. |
1109 | PriceGroupCreate = 0 | 1133 | PriceGroupCreate = 0 |
1110 | 1134 | ||
1111 | ; We don't really know what the rest of these values do. These get sent to the client | 1135 | ; We don't really know what the rest of these values do. These get sent to the client |
1112 | ; These taken from Agni at a Public Telehub. Change at your own risk. | 1136 | ; These taken from Agni at a Public Telehub. Change at your own risk. |
@@ -1301,24 +1325,6 @@ | |||
1301 | broker = "http://broker.place.com/{1}" | 1325 | broker = "http://broker.place.com/{1}" |
1302 | 1326 | ||
1303 | 1327 | ||
1304 | [RegionReady] | ||
1305 | ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled | ||
1306 | ; default is false | ||
1307 | enabled = false | ||
1308 | |||
1309 | ; Channel on which to signal region readiness through a message | ||
1310 | ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]" | ||
1311 | ; - the first field indicating whether this is an initial server startup | ||
1312 | ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error) | ||
1313 | ; - the third field is a number indicating how many scripts failed to compile | ||
1314 | ; - "oar error" if supplied, provides the error message from the OAR load | ||
1315 | channel_notify = -800 | ||
1316 | ; - disallow logins while scripts are loading | ||
1317 | login_disable = false | ||
1318 | ; - send an alert as json to a service | ||
1319 | ; alert_uri = "http://myappserver.net/my_handler/" | ||
1320 | |||
1321 | |||
1322 | [MRM] | 1328 | [MRM] |
1323 | ; Enables the Mini Region Modules Script Engine. | 1329 | ; Enables the Mini Region Modules Script Engine. |
1324 | ; default is false | 1330 | ; default is false |