diff options
author | BlueWall | 2012-10-09 06:44:14 -0400 |
---|---|---|
committer | BlueWall | 2012-10-09 06:44:14 -0400 |
commit | 252af020b05f386f88174cdd28191e0efbeba626 (patch) | |
tree | f425499b4338fa3a15f51b7621f4d37dec1d5ce7 /OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |
parent | Added parts to manage repositories and plugin management (diff) | |
parent | Fix build break (diff) | |
download | opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.zip opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.gz opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.bz2 opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.xz |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/ServerMain.cs
Diffstat (limited to '')
-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; |