aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-14 11:43:31 -0700
committerJohn Hurliman2009-10-14 11:43:31 -0700
commit0d2e6463d714bce8a6a628bd647c625feeeae8f6 (patch)
tree1d4a805e65932c225a4c6a2b219b23840b3288a9 /bin
parent* Split Task category into Task and State (diff)
downloadopensim-SC_OLD-0d2e6463d714bce8a6a628bd647c625feeeae8f6.zip
opensim-SC_OLD-0d2e6463d714bce8a6a628bd647c625feeeae8f6.tar.gz
opensim-SC_OLD-0d2e6463d714bce8a6a628bd647c625feeeae8f6.tar.bz2
opensim-SC_OLD-0d2e6463d714bce8a6a628bd647c625feeeae8f6.tar.xz
* Minimized the number of times textures are pulled off the priority queue
* OnQueueEmpty is still called async, but will not be called for a given category if the previous callback for that category is still running. This is the most balanced behavior I could find, and seems to work well * Added support for the old [ClientStack.LindenUDP] settings (including setting the receive buffer size) and added the new token bucket and global throttle settings * Added the AssetLoaderEnabled config variable to optionally disable loading assets from XML every startup. This gives a dramatic improvement in startup times for those who don't need the functionality every startup
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ini.example62
1 files changed, 37 insertions, 25 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 5cb51b2..0ab6257 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -341,25 +341,6 @@
341 341
342 342
343[ClientStack.LindenUDP] 343[ClientStack.LindenUDP]
344 ; This is the multiplier applied to all client throttles for outgoing UDP network data
345 ; If it is set to 1, then we obey the throttle settings as given to us by the client. If it is set to 3, for example, then we
346 ; multiply that setting by 3 (e.g. if the client gives us a setting of 250 kilobits per second then we
347 ; will actually push down data at a maximum rate of 750 kilobits per second).
348 ;
349 ; In principle, setting a multiplier greater than 1 will allow data to be pushed down to a client much faster
350 ; than its UI allows the setting to go. This may be okay in some situations, such as standalone OpenSim
351 ; applications on a LAN. However, the greater the multipler, the higher the risk of packet drop, resulting
352 ; in symptoms such as missing terrain or objects. A much better solution is to change the client UI to allow
353 ; higher network bandwidth settings directly, though this isn't always possible.
354 ;
355 ; Currently this setting is 2 by default because we currently send much more texture data than is strictly
356 ; necessary. A setting of 1 could result in slow texture transfer. This will be fixed when the transfer
357 ; of textures at different levels of quality is improved.
358 ;
359 ; Pre r7113, this setting was not exposed but was effectively 8. You may want to try this if you encounter
360 ; unexpected difficulties
361 client_throttle_multiplier = 2;
362
363 ; the client socket receive buffer size determines how many 344 ; the client socket receive buffer size determines how many
364 ; incoming requests we can process; the default on .NET is 8192 345 ; incoming requests we can process; the default on .NET is 8192
365 ; which is about 2 4k-sized UDP datagrams. On mono this is 346 ; which is about 2 4k-sized UDP datagrams. On mono this is
@@ -374,12 +355,39 @@
374 ; by the system's settings for the maximum client receive buffer 355 ; by the system's settings for the maximum client receive buffer
375 ; size (on linux systems you can set that with "sysctl -w 356 ; size (on linux systems you can set that with "sysctl -w
376 ; net.core.rmem_max=X") 357 ; net.core.rmem_max=X")
377 ; 358 ;client_socket_rcvbuf_size = 8388608
378 ; client_socket_rcvbuf_size = 8388608 359
379 360 ; Maximum outbound bits per second for a single scene. This can be used to
380 ; Maximum bits per second to send to any single client. This will override the user's viewer preference settings. 361 ; throttle total outbound UDP traffic for a simulator. The default value is
381 362 ; 0, meaning no throttling at the scene level. The example given here is
382 ; client_throttle_max_bps = 1500000 363 ; 20 megabits
364 ;scene_throttle_max_bps = 20971520
365
366 ; Maximum bits per second to send to any single client. This will override
367 ; the user's viewer preference settings. The default value is 0, meaning no
368 ; aggregate throttling on clients (only per-category throttling). The
369 ; example given here is 1.5 megabits
370 ;client_throttle_max_bps = 1572864
371
372 ; Per-client bits per second rates for the various throttle categories.
373 ; These are default values that will be overriden by clients
374 ;resend_default = 12500
375 ;land_default = 500
376 ;wind_default = 500
377 ;cloud_default = 50
378 ;task_default = 500
379 ;texture_default = 500
380 ;asset_default = 500
381
382 ; Per-client maximum burst rates in bits per second for the various throttle
383 ; categories. These are default values that will be overriden by clients
384 ;resend_limit = 18750
385 ;land_limit = 29750
386 ;wind_limit = 18750
387 ;cloud_limit = 18750
388 ;task_limit = 55750
389 ;texture_limit = 55750
390 ;asset_limit = 27500
383 391
384[Chat] 392[Chat]
385 ; Controls whether the chat module is enabled. Default is true. 393 ; Controls whether the chat module is enabled. Default is true.
@@ -1381,6 +1389,10 @@
1381[AssetService] 1389[AssetService]
1382 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 1390 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
1383 AssetLoaderArgs = "assets/AssetSets.xml" 1391 AssetLoaderArgs = "assets/AssetSets.xml"
1392
1393 ; Disable this to prevent the default asset set from being inserted into the
1394 ; asset store each time the region starts
1395 AssetLoaderEnabled = true
1384 1396
1385[GridService] 1397[GridService]
1386 ;; default standalone, overridable in StandaloneCommon.ini 1398 ;; default standalone, overridable in StandaloneCommon.ini