aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2012-10-17 00:03:02 +0100
committerMelanie2012-10-17 00:03:02 +0100
commitad60a29c9303e68717ccc057988a36da0990b0ae (patch)
treea4e965250d291476b1449bd0e949e5e204cf0446 /bin
parentMerge branch 'master' into careminster (diff)
parentAdd optional pool for the UDPPacketBuffer objects that handle all incoming UD... (diff)
downloadopensim-SC_OLD-ad60a29c9303e68717ccc057988a36da0990b0ae.zip
opensim-SC_OLD-ad60a29c9303e68717ccc057988a36da0990b0ae.tar.gz
opensim-SC_OLD-ad60a29c9303e68717ccc057988a36da0990b0ae.tar.bz2
opensim-SC_OLD-ad60a29c9303e68717ccc057988a36da0990b0ae.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6a67e77..7d321a7 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1598,10 +1598,14 @@
1598 1598
1599 1599
1600[PacketPool] 1600[PacketPool]
1601 ; Enables the experimental packet pool. Yes, we've been here before.
1602 ;RecyclePackets = true; 1601 ;RecyclePackets = true;
1603 ;RecycleDataBlocks = true; 1602 ;RecycleDataBlocks = true;
1604 1603
1604 ; If true, then the basic packet objects used to receive data are also recycled, not just the LLUDP packets.
1605 ; This reduces data churn
1606 ; This setting is currently experimental and defaults to false.
1607 RecycleBaseUDPPackets = false;
1608
1605 1609
1606[InterestManagement] 1610[InterestManagement]
1607 ; This section controls how state updates are prioritized for each client 1611 ; This section controls how state updates are prioritized for each client