diff options
author | Justin Clark-Casey (justincc) | 2012-10-05 01:43:29 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-05 01:43:29 +0100 |
commit | 7c7cdf3431c1c8ee1575779f96980ac1d0de6be8 (patch) | |
tree | 3433e1c744ea2aa6a75927e00c913f498eff13c5 /OpenSim/Region | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-7c7cdf3431c1c8ee1575779f96980ac1d0de6be8.zip opensim-SC-7c7cdf3431c1c8ee1575779f96980ac1d0de6be8.tar.gz opensim-SC-7c7cdf3431c1c8ee1575779f96980ac1d0de6be8.tar.bz2 opensim-SC-7c7cdf3431c1c8ee1575779f96980ac1d0de6be8.tar.xz |
Read PacketPool config in LLUDPServer with other config params rather than in Scene.
This is to resolve previous build break.
This unnecessarily but harmlessly reads and sets the parameter multiple times - scene was doing the same thing.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 55780d6..d11fcbf 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -222,6 +222,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
222 | m_pausedAckTimeout = 1000 * 300; // 5 minutes | 222 | m_pausedAckTimeout = 1000 * 300; // 5 minutes |
223 | } | 223 | } |
224 | 224 | ||
225 | // FIXME: This actually only needs to be done once since the PacketPool is shared across all servers. | ||
226 | // However, there is no harm in temporarily doing it multiple times. | ||
227 | IConfig packetConfig = configSource.Configs["PacketPool"]; | ||
228 | if (packetConfig != null) | ||
229 | { | ||
230 | PacketPool.Instance.RecyclePackets = packetConfig.GetBoolean("RecyclePackets", true); | ||
231 | PacketPool.Instance.RecycleDataBlocks = packetConfig.GetBoolean("RecycleDataBlocks", true); | ||
232 | } | ||
233 | |||
225 | #region BinaryStats | 234 | #region BinaryStats |
226 | config = configSource.Configs["Statistics.Binary"]; | 235 | config = configSource.Configs["Statistics.Binary"]; |
227 | m_shouldCollectStats = false; | 236 | m_shouldCollectStats = false; |