aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2010-02-22 13:18:11 +0900
committerJeff Ames2010-02-22 13:18:11 +0900
commite6c869ddfc73af3cdb01b1232932db81cf6d0621 (patch)
treed78778898d2426e2e7a02bd3dc3dce1f3cd3c6aa
parentSeparate PhysX classes into separate files. (diff)
downloadopensim-SC-e6c869ddfc73af3cdb01b1232932db81cf6d0621.zip
opensim-SC-e6c869ddfc73af3cdb01b1232932db81cf6d0621.tar.gz
opensim-SC-e6c869ddfc73af3cdb01b1232932db81cf6d0621.tar.bz2
opensim-SC-e6c869ddfc73af3cdb01b1232932db81cf6d0621.tar.xz
Minor formatting cleanup.
-rw-r--r--bin/OpenSim.ini.example66
-rw-r--r--bin/config-include/Standalone.ini5
2 files changed, 35 insertions, 36 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index ebc9b24..5214718 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -31,26 +31,26 @@
31 31
32 ; To run a script every few minutes, set the script filename here 32 ; To run a script every few minutes, set the script filename here
33 ; timer_Script = "filename" 33 ; timer_Script = "filename"
34 34
35 ; ## 35 ; ##
36 ; ## SYSTEM 36 ; ## SYSTEM
37 ; ## 37 ; ##
38 38
39 ; Sets the method that OpenSim will use to fire asynchronous 39 ; Sets the method that OpenSim will use to fire asynchronous
40 ; events. Valid values are UnsafeQueueUserWorkItem, 40 ; events. Valid values are UnsafeQueueUserWorkItem,
41 ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread. 41 ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread.
42 ; SmartThreadPool is reported to work well on Mono/Linux, but 42 ; SmartThreadPool is reported to work well on Mono/Linux, but
43 ; UnsafeQueueUserWorkItem has been benchmarked with better 43 ; UnsafeQueueUserWorkItem has been benchmarked with better
44 ; performance on .NET/Windows 44 ; performance on .NET/Windows
45 async_call_method = SmartThreadPool 45 async_call_method = SmartThreadPool
46 46
47 ; There are several operations on large collections (such as 47 ; There are several operations on large collections (such as
48 ; the current avatar list) that can be run synchronously or 48 ; the current avatar list) that can be run synchronously or
49 ; in parallel. Running in parallel should increase performance 49 ; in parallel. Running in parallel should increase performance
50 ; on a multi-core system, but will make debugging more 50 ; on a multi-core system, but will make debugging more
51 ; difficult if something deadlocks or times out 51 ; difficult if something deadlocks or times out
52 use_async_when_possible = false 52 use_async_when_possible = false
53 53
54 ; Max threads to allocate on the FireAndForget thread pool 54 ; Max threads to allocate on the FireAndForget thread pool
55 ; when running with the SmartThreadPool option above 55 ; when running with the SmartThreadPool option above
56 MaxPoolThreads = 15 56 MaxPoolThreads = 15
@@ -103,7 +103,7 @@
103 103
104 ; How many prims to send to each avatar in the scene on each Update() 104 ; How many prims to send to each avatar in the scene on each Update()
105 ; MaxPrimsPerFrame = 200 105 ; MaxPrimsPerFrame = 200
106 106
107 ; Combine all contiguous regions into one large region 107 ; Combine all contiguous regions into one large region
108 ; Order your regions from South to North, West to East in your regions.ini and then set this to true 108 ; Order your regions from South to North, West to East in your regions.ini and then set this to true
109 ; Warning! Don't use this with regions that have existing content!, This will likely break them 109 ; Warning! Don't use this with regions that have existing content!, This will likely break them
@@ -351,7 +351,7 @@
351 http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer 351 http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer
352 352
353 ; Hostname to use in llRequestURL/llRequestSecureURL 353 ; Hostname to use in llRequestURL/llRequestSecureURL
354 ; if not defined - default machine name is being used 354 ; if not defined - default machine name is being used
355 ; (on Windows this mean NETBIOS name - useably only inside local network) 355 ; (on Windows this mean NETBIOS name - useably only inside local network)
356 ; ExternalHostNameForLSL=127.0.0.1 356 ; ExternalHostNameForLSL=127.0.0.1
357 ; Uncomment below to enable llRemoteData/remote channels 357 ; Uncomment below to enable llRemoteData/remote channels
@@ -388,11 +388,11 @@
388[ClientStack.LindenUDP] 388[ClientStack.LindenUDP]
389 ; Set this to true to process incoming packets asynchronously. Networking is 389 ; Set this to true to process incoming packets asynchronously. Networking is
390 ; already separated from packet handling with a queue, so this will only 390 ; already separated from packet handling with a queue, so this will only
391 ; affect whether networking internals such as packet decoding and 391 ; affect whether networking internals such as packet decoding and
392 ; acknowledgement accounting are done synchronously or asynchronously 392 ; acknowledgement accounting are done synchronously or asynchronously
393 ; 393 ;
394 ;async_packet_handling = false 394 ;async_packet_handling = false
395 395
396 ; The client socket receive buffer size determines how many 396 ; The client socket receive buffer size determines how many
397 ; incoming requests we can process; the default on .NET is 8192 397 ; incoming requests we can process; the default on .NET is 8192
398 ; which is about 2 4k-sized UDP datagrams. On mono this is 398 ; which is about 2 4k-sized UDP datagrams. On mono this is
@@ -409,7 +409,7 @@
409 ; net.core.rmem_max=X") 409 ; net.core.rmem_max=X")
410 ; 410 ;
411 ;client_socket_rcvbuf_size = 8388608 411 ;client_socket_rcvbuf_size = 8388608
412 412
413 ; Maximum outbound bytes per second for a single scene. This can be used to 413 ; Maximum outbound bytes per second for a single scene. This can be used to
414 ; throttle total outbound UDP traffic for a simulator. The default value is 414 ; throttle total outbound UDP traffic for a simulator. The default value is
415 ; 0, meaning no throttling at the scene level. The example given here is 415 ; 0, meaning no throttling at the scene level. The example given here is
@@ -417,13 +417,13 @@
417 ; 417 ;
418 ;scene_throttle_max_bps = 2621440 418 ;scene_throttle_max_bps = 2621440
419 419
420 ; Maximum bits per second to send to any single client. This will override 420 ; Maximum bits per second to send to any single client. This will override
421 ; the user's viewer preference settings. The default value is 0, meaning no 421 ; the user's viewer preference settings. The default value is 0, meaning no
422 ; aggregate throttling on clients (only per-category throttling). The 422 ; aggregate throttling on clients (only per-category throttling). The
423 ; example given here is 1.5 megabits 423 ; example given here is 1.5 megabits
424 ; 424 ;
425 ;client_throttle_max_bps = 196608 425 ;client_throttle_max_bps = 196608
426 426
427 ; Per-client bytes per second rates for the various throttle categories. 427 ; Per-client bytes per second rates for the various throttle categories.
428 ; These are default values that will be overriden by clients 428 ; These are default values that will be overriden by clients
429 ; 429 ;
@@ -435,7 +435,7 @@
435 ;texture_default = 1000 435 ;texture_default = 1000
436 ;asset_default = 1000 436 ;asset_default = 1000
437 ;state_default = 1000 437 ;state_default = 1000
438 438
439 ; Per-client maximum burst rates in bytes per second for the various 439 ; Per-client maximum burst rates in bytes per second for the various
440 ; throttle categories. These are default values that will be overriden by 440 ; throttle categories. These are default values that will be overriden by
441 ; clients 441 ; clients
@@ -448,10 +448,10 @@
448 ;texture_limit = 55750 448 ;texture_limit = 55750
449 ;asset_limit = 27500 449 ;asset_limit = 27500
450 ;state_limit = 37000 450 ;state_limit = 37000
451 451
452 ; Configures how ObjectUpdates are aggregated. These numbers 452 ; Configures how ObjectUpdates are aggregated. These numbers
453 ; do not literally mean how many updates will be put in each 453 ; do not literally mean how many updates will be put in each
454 ; packet that goes over the wire, as packets are 454 ; packet that goes over the wire, as packets are
455 ; automatically split on a 1400 byte boundary. These control 455 ; automatically split on a 1400 byte boundary. These control
456 ; the balance between responsiveness of interest list updates 456 ; the balance between responsiveness of interest list updates
457 ; and total throughput. Higher numbers will ensure more full- 457 ; and total throughput. Higher numbers will ensure more full-
@@ -609,7 +609,7 @@
609 ; used to control llMove2Target 609 ; used to control llMove2Target
610 body_pid_derivative = 35 610 body_pid_derivative = 35
611 body_pid_gain = 25 611 body_pid_gain = 25
612 612
613 ; maximum number of contact points to generate per collision 613 ; maximum number of contact points to generate per collision
614 contacts_per_collision = 80 614 contacts_per_collision = 80
615 615
@@ -798,7 +798,7 @@
798 ;;arrival and departure of certain users. For example: admins, bots. 798 ;;arrival and departure of certain users. For example: admins, bots.
799 799
800 ;exclude_list=User 1,User 2,User 3 800 ;exclude_list=User 1,User 2,User 3
801 801
802 802
803;[CMS] 803;[CMS]
804 ;enabled = true 804 ;enabled = true
@@ -975,7 +975,7 @@
975 975
976 ; Stack size per thread created 976 ; Stack size per thread created
977 ThreadStackSize = 262144 977 ThreadStackSize = 262144
978 978
979 ; Set this to true (the default) to load each script into a separate 979 ; Set this to true (the default) to load each script into a separate
980 ; AppDomain. Setting this to false will load all script assemblies into the 980 ; AppDomain. Setting this to false will load all script assemblies into the
981 ; current AppDomain, which will reduce the per-script overhead at the 981 ; current AppDomain, which will reduce the per-script overhead at the
@@ -1167,25 +1167,25 @@
1167 ; Enables the Mini Region Modules Script Engine. 1167 ; Enables the Mini Region Modules Script Engine.
1168 ; default is false 1168 ; default is false
1169 Enabled = false 1169 Enabled = false
1170 1170
1171 ; Runs MRM in a Security Sandbox 1171 ; Runs MRM in a Security Sandbox
1172 ; WARNING: DISABLING IS A SECURITY RISK. 1172 ; WARNING: DISABLING IS A SECURITY RISK.
1173 Sandboxed = true 1173 Sandboxed = true
1174 1174
1175 ; The level sandbox to use, adjust at your OWN RISK. 1175 ; The level sandbox to use, adjust at your OWN RISK.
1176 ; Valid values are: 1176 ; Valid values are:
1177 ; * FullTrust 1177 ; * FullTrust
1178 ; * SkipVerification 1178 ; * SkipVerification
1179 ; * Execution 1179 ; * Execution
1180 ; * Nothing 1180 ; * Nothing
1181 ; * LocalIntranet 1181 ; * LocalIntranet
1182 ; * Internet 1182 ; * Internet
1183 ; * Everything 1183 ; * Everything
1184 SandboxLevel = "Internet" 1184 SandboxLevel = "Internet"
1185 1185
1186 ; Only allow Region Owners to run MRMs 1186 ; Only allow Region Owners to run MRMs
1187 ; May represent a security risk if you disable this. 1187 ; May represent a security risk if you disable this.
1188 OwnerOnly = true 1188 OwnerOnly = true
1189 1189
1190[Hypergrid] 1190[Hypergrid]
1191 ; Keep it false for now. Making it true requires the use of a special client in order to access inventory 1191 ; Keep it false for now. Making it true requires the use of a special client in order to access inventory
@@ -1335,7 +1335,7 @@
1335 1335
1336[WebStats] 1336[WebStats]
1337; View region statistics via a web page 1337; View region statistics via a web page
1338; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page 1338; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
1339; Use a web browser and type in the "Login URI" + "/SStats/" 1339; Use a web browser and type in the "Login URI" + "/SStats/"
1340; For example- http://127.0.0.1:9000/SStats/ 1340; For example- http://127.0.0.1:9000/SStats/
1341; enabled=false 1341; enabled=false
@@ -1354,14 +1354,14 @@
1354[AssetService] 1354[AssetService]
1355 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 1355 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
1356 AssetLoaderArgs = "assets/AssetSets.xml" 1356 AssetLoaderArgs = "assets/AssetSets.xml"
1357 1357
1358 ; Disable this to prevent the default asset set from being inserted into the 1358 ; Disable this to prevent the default asset set from being inserted into the
1359 ; asset store each time the region starts 1359 ; asset store each time the region starts
1360 AssetLoaderEnabled = true 1360 AssetLoaderEnabled = true
1361 1361
1362[GridService] 1362[GridService]
1363 ;; default standalone, overridable in StandaloneCommon.ini 1363 ;; default standalone, overridable in StandaloneCommon.ini
1364 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 1364 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
1365 1365
1366 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1366 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1367 ;; The following is the configuration section for the new style services 1367 ;; The following is the configuration section for the new style services
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index cdfdf4b..35ee01e 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -20,11 +20,10 @@
20 20
21[InventoryService] 21[InventoryService]
22 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 22 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
23 23
24[AuthorizationService] 24[AuthorizationService]
25 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" 25 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
26 26
27[GridService] 27[GridService]
28 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 28 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
29 Realm = "regions" 29 Realm = "regions"
30