diff options
| author | Melanie | 2012-02-24 09:56:06 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-24 09:56:06 +0000 |
| commit | 37068d17c5a6a4679f75af12cbbcfc3c78790e33 (patch) | |
| tree | 42454c2fd6072b0baebb4f3d7632476de3ad18e9 /OpenSim/Region/ClientStack | |
| parent | Partially apply the core banlines fix (diff) | |
| parent | Take watchdog alarm calling back outside the m_threads lock. (diff) | |
| download | opensim-SC_OLD-37068d17c5a6a4679f75af12cbbcfc3c78790e33.zip opensim-SC_OLD-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.gz opensim-SC_OLD-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.bz2 opensim-SC_OLD-37068d17c5a6a4679f75af12cbbcfc3c78790e33.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index a79b387..75f783b 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
| @@ -244,8 +244,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 244 | base.Start(m_recvBufferSize, m_asyncPacketHandling); | 244 | base.Start(m_recvBufferSize, m_asyncPacketHandling); |
| 245 | 245 | ||
| 246 | // Start the packet processing threads | 246 | // Start the packet processing threads |
| 247 | Watchdog.StartThread(IncomingPacketHandler, "Incoming Packets (" + m_scene.RegionInfo.RegionName + ")", ThreadPriority.Normal, false); | 247 | Watchdog.StartThread( |
| 248 | Watchdog.StartThread(OutgoingPacketHandler, "Outgoing Packets (" + m_scene.RegionInfo.RegionName + ")", ThreadPriority.Normal, false); | 248 | IncomingPacketHandler, "Incoming Packets (" + m_scene.RegionInfo.RegionName + ")", ThreadPriority.Normal, false, true); |
| 249 | Watchdog.StartThread( | ||
| 250 | OutgoingPacketHandler, "Outgoing Packets (" + m_scene.RegionInfo.RegionName + ")", ThreadPriority.Normal, false, true); | ||
| 251 | |||
| 249 | m_elapsedMSSinceLastStatReport = Environment.TickCount; | 252 | m_elapsedMSSinceLastStatReport = Environment.TickCount; |
| 250 | } | 253 | } |
| 251 | 254 | ||