diff options
author | Melanie | 2010-03-01 01:01:32 +0000 |
---|---|---|
committer | Melanie | 2010-03-01 01:01:32 +0000 |
commit | 38ea1dd5c82df6e037f7e634df572df5a38b2bd0 (patch) | |
tree | 5d94d42e833985ff13a1522085b28f9889d70595 /bin | |
parent | Should have things the right way around, better that way (diff) | |
parent | fix bug where region settings loaded via an oar (water height, terrain textur... (diff) | |
download | opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.zip opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.tar.gz opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.tar.bz2 opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.tar.xz |
Merge branch 'master' into presence-refactor
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSim.ini.example | 64 | ||||
-rw-r--r-- | bin/config-include/Standalone.ini | 3 |
2 files changed, 33 insertions, 34 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 00e54db..020632f 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -24,26 +24,26 @@ | |||
24 | 24 | ||
25 | ; To run a script every few minutes, set the script filename here | 25 | ; To run a script every few minutes, set the script filename here |
26 | ; timer_Script = "filename" | 26 | ; timer_Script = "filename" |
27 | 27 | ||
28 | ; ## | 28 | ; ## |
29 | ; ## SYSTEM | 29 | ; ## SYSTEM |
30 | ; ## | 30 | ; ## |
31 | 31 | ||
32 | ; Sets the method that OpenSim will use to fire asynchronous | 32 | ; Sets the method that OpenSim will use to fire asynchronous |
33 | ; events. Valid values are UnsafeQueueUserWorkItem, | 33 | ; events. Valid values are UnsafeQueueUserWorkItem, |
34 | ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread. | 34 | ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread. |
35 | ; SmartThreadPool is reported to work well on Mono/Linux, but | 35 | ; SmartThreadPool is reported to work well on Mono/Linux, but |
36 | ; UnsafeQueueUserWorkItem has been benchmarked with better | 36 | ; UnsafeQueueUserWorkItem has been benchmarked with better |
37 | ; performance on .NET/Windows | 37 | ; performance on .NET/Windows |
38 | async_call_method = SmartThreadPool | 38 | async_call_method = SmartThreadPool |
39 | 39 | ||
40 | ; There are several operations on large collections (such as | 40 | ; There are several operations on large collections (such as |
41 | ; the current avatar list) that can be run synchronously or | 41 | ; the current avatar list) that can be run synchronously or |
42 | ; in parallel. Running in parallel should increase performance | 42 | ; in parallel. Running in parallel should increase performance |
43 | ; on a multi-core system, but will make debugging more | 43 | ; on a multi-core system, but will make debugging more |
44 | ; difficult if something deadlocks or times out | 44 | ; difficult if something deadlocks or times out |
45 | use_async_when_possible = false | 45 | use_async_when_possible = false |
46 | 46 | ||
47 | ; Max threads to allocate on the FireAndForget thread pool | 47 | ; Max threads to allocate on the FireAndForget thread pool |
48 | ; when running with the SmartThreadPool option above | 48 | ; when running with the SmartThreadPool option above |
49 | MaxPoolThreads = 15 | 49 | MaxPoolThreads = 15 |
@@ -96,7 +96,7 @@ | |||
96 | 96 | ||
97 | ; How many prims to send to each avatar in the scene on each Update() | 97 | ; How many prims to send to each avatar in the scene on each Update() |
98 | ; MaxPrimsPerFrame = 200 | 98 | ; MaxPrimsPerFrame = 200 |
99 | 99 | ||
100 | ; Combine all contiguous regions into one large region | 100 | ; Combine all contiguous regions into one large region |
101 | ; Order your regions from South to North, West to East in your regions.ini and then set this to true | 101 | ; Order your regions from South to North, West to East in your regions.ini and then set this to true |
102 | ; Warning! Don't use this with regions that have existing content!, This will likely break them | 102 | ; Warning! Don't use this with regions that have existing content!, This will likely break them |
@@ -283,7 +283,7 @@ | |||
283 | http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer | 283 | http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer |
284 | 284 | ||
285 | ; Hostname to use in llRequestURL/llRequestSecureURL | 285 | ; Hostname to use in llRequestURL/llRequestSecureURL |
286 | ; if not defined - default machine name is being used | 286 | ; if not defined - default machine name is being used |
287 | ; (on Windows this mean NETBIOS name - useably only inside local network) | 287 | ; (on Windows this mean NETBIOS name - useably only inside local network) |
288 | ; ExternalHostNameForLSL=127.0.0.1 | 288 | ; ExternalHostNameForLSL=127.0.0.1 |
289 | ; Uncomment below to enable llRemoteData/remote channels | 289 | ; Uncomment below to enable llRemoteData/remote channels |
@@ -305,11 +305,11 @@ | |||
305 | [ClientStack.LindenUDP] | 305 | [ClientStack.LindenUDP] |
306 | ; Set this to true to process incoming packets asynchronously. Networking is | 306 | ; Set this to true to process incoming packets asynchronously. Networking is |
307 | ; already separated from packet handling with a queue, so this will only | 307 | ; already separated from packet handling with a queue, so this will only |
308 | ; affect whether networking internals such as packet decoding and | 308 | ; affect whether networking internals such as packet decoding and |
309 | ; acknowledgement accounting are done synchronously or asynchronously | 309 | ; acknowledgement accounting are done synchronously or asynchronously |
310 | ; | 310 | ; |
311 | ;async_packet_handling = false | 311 | ;async_packet_handling = false |
312 | 312 | ||
313 | ; The client socket receive buffer size determines how many | 313 | ; The client socket receive buffer size determines how many |
314 | ; incoming requests we can process; the default on .NET is 8192 | 314 | ; incoming requests we can process; the default on .NET is 8192 |
315 | ; which is about 2 4k-sized UDP datagrams. On mono this is | 315 | ; which is about 2 4k-sized UDP datagrams. On mono this is |
@@ -326,7 +326,7 @@ | |||
326 | ; net.core.rmem_max=X") | 326 | ; net.core.rmem_max=X") |
327 | ; | 327 | ; |
328 | ;client_socket_rcvbuf_size = 8388608 | 328 | ;client_socket_rcvbuf_size = 8388608 |
329 | 329 | ||
330 | ; Maximum outbound bytes per second for a single scene. This can be used to | 330 | ; Maximum outbound bytes per second for a single scene. This can be used to |
331 | ; throttle total outbound UDP traffic for a simulator. The default value is | 331 | ; throttle total outbound UDP traffic for a simulator. The default value is |
332 | ; 0, meaning no throttling at the scene level. The example given here is | 332 | ; 0, meaning no throttling at the scene level. The example given here is |
@@ -334,13 +334,13 @@ | |||
334 | ; | 334 | ; |
335 | ;scene_throttle_max_bps = 2621440 | 335 | ;scene_throttle_max_bps = 2621440 |
336 | 336 | ||
337 | ; Maximum bits per second to send to any single client. This will override | 337 | ; Maximum bits per second to send to any single client. This will override |
338 | ; the user's viewer preference settings. The default value is 0, meaning no | 338 | ; the user's viewer preference settings. The default value is 0, meaning no |
339 | ; aggregate throttling on clients (only per-category throttling). The | 339 | ; aggregate throttling on clients (only per-category throttling). The |
340 | ; example given here is 1.5 megabits | 340 | ; example given here is 1.5 megabits |
341 | ; | 341 | ; |
342 | ;client_throttle_max_bps = 196608 | 342 | ;client_throttle_max_bps = 196608 |
343 | 343 | ||
344 | ; Per-client bytes per second rates for the various throttle categories. | 344 | ; Per-client bytes per second rates for the various throttle categories. |
345 | ; These are default values that will be overriden by clients | 345 | ; These are default values that will be overriden by clients |
346 | ; | 346 | ; |
@@ -352,7 +352,7 @@ | |||
352 | ;texture_default = 1000 | 352 | ;texture_default = 1000 |
353 | ;asset_default = 1000 | 353 | ;asset_default = 1000 |
354 | ;state_default = 1000 | 354 | ;state_default = 1000 |
355 | 355 | ||
356 | ; Per-client maximum burst rates in bytes per second for the various | 356 | ; Per-client maximum burst rates in bytes per second for the various |
357 | ; throttle categories. These are default values that will be overriden by | 357 | ; throttle categories. These are default values that will be overriden by |
358 | ; clients | 358 | ; clients |
@@ -365,10 +365,10 @@ | |||
365 | ;texture_limit = 55750 | 365 | ;texture_limit = 55750 |
366 | ;asset_limit = 27500 | 366 | ;asset_limit = 27500 |
367 | ;state_limit = 37000 | 367 | ;state_limit = 37000 |
368 | 368 | ||
369 | ; Configures how ObjectUpdates are aggregated. These numbers | 369 | ; Configures how ObjectUpdates are aggregated. These numbers |
370 | ; do not literally mean how many updates will be put in each | 370 | ; do not literally mean how many updates will be put in each |
371 | ; packet that goes over the wire, as packets are | 371 | ; packet that goes over the wire, as packets are |
372 | ; automatically split on a 1400 byte boundary. These control | 372 | ; automatically split on a 1400 byte boundary. These control |
373 | ; the balance between responsiveness of interest list updates | 373 | ; the balance between responsiveness of interest list updates |
374 | ; and total throughput. Higher numbers will ensure more full- | 374 | ; and total throughput. Higher numbers will ensure more full- |
@@ -526,7 +526,7 @@ | |||
526 | ; used to control llMove2Target | 526 | ; used to control llMove2Target |
527 | body_pid_derivative = 35 | 527 | body_pid_derivative = 35 |
528 | body_pid_gain = 25 | 528 | body_pid_gain = 25 |
529 | 529 | ||
530 | ; maximum number of contact points to generate per collision | 530 | ; maximum number of contact points to generate per collision |
531 | contacts_per_collision = 80 | 531 | contacts_per_collision = 80 |
532 | 532 | ||
@@ -715,7 +715,7 @@ | |||
715 | ;;arrival and departure of certain users. For example: admins, bots. | 715 | ;;arrival and departure of certain users. For example: admins, bots. |
716 | 716 | ||
717 | ;exclude_list=User 1,User 2,User 3 | 717 | ;exclude_list=User 1,User 2,User 3 |
718 | 718 | ||
719 | 719 | ||
720 | ;[CMS] | 720 | ;[CMS] |
721 | ;enabled = true | 721 | ;enabled = true |
@@ -892,7 +892,7 @@ | |||
892 | 892 | ||
893 | ; Stack size per thread created | 893 | ; Stack size per thread created |
894 | ThreadStackSize = 262144 | 894 | ThreadStackSize = 262144 |
895 | 895 | ||
896 | ; Set this to true (the default) to load each script into a separate | 896 | ; Set this to true (the default) to load each script into a separate |
897 | ; AppDomain. Setting this to false will load all script assemblies into the | 897 | ; AppDomain. Setting this to false will load all script assemblies into the |
898 | ; current AppDomain, which will reduce the per-script overhead at the | 898 | ; current AppDomain, which will reduce the per-script overhead at the |
@@ -1084,25 +1084,25 @@ | |||
1084 | ; Enables the Mini Region Modules Script Engine. | 1084 | ; Enables the Mini Region Modules Script Engine. |
1085 | ; default is false | 1085 | ; default is false |
1086 | Enabled = false | 1086 | Enabled = false |
1087 | 1087 | ||
1088 | ; Runs MRM in a Security Sandbox | 1088 | ; Runs MRM in a Security Sandbox |
1089 | ; WARNING: DISABLING IS A SECURITY RISK. | 1089 | ; WARNING: DISABLING IS A SECURITY RISK. |
1090 | Sandboxed = true | 1090 | Sandboxed = true |
1091 | 1091 | ||
1092 | ; The level sandbox to use, adjust at your OWN RISK. | 1092 | ; The level sandbox to use, adjust at your OWN RISK. |
1093 | ; Valid values are: | 1093 | ; Valid values are: |
1094 | ; * FullTrust | 1094 | ; * FullTrust |
1095 | ; * SkipVerification | 1095 | ; * SkipVerification |
1096 | ; * Execution | 1096 | ; * Execution |
1097 | ; * Nothing | 1097 | ; * Nothing |
1098 | ; * LocalIntranet | 1098 | ; * LocalIntranet |
1099 | ; * Internet | 1099 | ; * Internet |
1100 | ; * Everything | 1100 | ; * Everything |
1101 | SandboxLevel = "Internet" | 1101 | SandboxLevel = "Internet" |
1102 | 1102 | ||
1103 | ; Only allow Region Owners to run MRMs | 1103 | ; Only allow Region Owners to run MRMs |
1104 | ; May represent a security risk if you disable this. | 1104 | ; May represent a security risk if you disable this. |
1105 | OwnerOnly = true | 1105 | OwnerOnly = true |
1106 | 1106 | ||
1107 | [Hypergrid] | 1107 | [Hypergrid] |
1108 | ; Keep it false for now. Making it true requires the use of a special client in order to access inventory | 1108 | ; Keep it false for now. Making it true requires the use of a special client in order to access inventory |
@@ -1252,7 +1252,7 @@ | |||
1252 | 1252 | ||
1253 | [WebStats] | 1253 | [WebStats] |
1254 | ; View region statistics via a web page | 1254 | ; View region statistics via a web page |
1255 | ; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page | 1255 | ; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page |
1256 | ; Use a web browser and type in the "Login URI" + "/SStats/" | 1256 | ; Use a web browser and type in the "Login URI" + "/SStats/" |
1257 | ; For example- http://127.0.0.1:9000/SStats/ | 1257 | ; For example- http://127.0.0.1:9000/SStats/ |
1258 | ; enabled=false | 1258 | ; enabled=false |
@@ -1271,7 +1271,7 @@ | |||
1271 | [AssetService] | 1271 | [AssetService] |
1272 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" | 1272 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" |
1273 | AssetLoaderArgs = "assets/AssetSets.xml" | 1273 | AssetLoaderArgs = "assets/AssetSets.xml" |
1274 | 1274 | ||
1275 | ; Disable this to prevent the default asset set from being inserted into the | 1275 | ; Disable this to prevent the default asset set from being inserted into the |
1276 | ; asset store each time the region starts | 1276 | ; asset store each time the region starts |
1277 | AssetLoaderEnabled = true | 1277 | AssetLoaderEnabled = true |
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index b35f8a5..bf693a1 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | [InventoryService] | 25 | [InventoryService] |
26 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" | 26 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" |
27 | |||
28 | [LibraryService] | 27 | [LibraryService] |
29 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" | 28 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" |
30 | LibraryName = "OpenSim Library" | 29 | LibraryName = "OpenSim Library" |
@@ -42,7 +41,7 @@ | |||
42 | ConnectionString = "URI=file:auth.db,version=3" | 41 | ConnectionString = "URI=file:auth.db,version=3" |
43 | 42 | ||
44 | [GridService] | 43 | [GridService] |
45 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 44 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
46 | Realm = "regions" | 45 | Realm = "regions" |
47 | StorageProvider = "OpenSim.Data.Null.dll" | 46 | StorageProvider = "OpenSim.Data.Null.dll" |
48 | 47 | ||