aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2013-07-15 11:52:26 -0700
committerDiva Canto2013-07-15 11:52:26 -0700
commit864f15ce4dfd412df8442a26429b9dd7a2bf9e12 (patch)
treed601c3bf0fae6ec62c8597bf14c4a85bb848eb85 /OpenSim
parentProtect against null requests (diff)
downloadopensim-SC_OLD-864f15ce4dfd412df8442a26429b9dd7a2bf9e12.zip
opensim-SC_OLD-864f15ce4dfd412df8442a26429b9dd7a2bf9e12.tar.gz
opensim-SC_OLD-864f15ce4dfd412df8442a26429b9dd7a2bf9e12.tar.bz2
opensim-SC_OLD-864f15ce4dfd412df8442a26429b9dd7a2bf9e12.tar.xz
Revert the revert
Revert "Trying to hunt the CPU spikes recently experienced." This reverts commit ac73e702935dd4607c13aaec3095940fba7932ca.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index e20a194..85270a6 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1615,6 +1615,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1615 { 1615 {
1616 IncomingPacket incomingPacket = null; 1616 IncomingPacket incomingPacket = null;
1617 1617
1618 /*
1618 // HACK: This is a test to try and rate limit packet handling on Mono. 1619 // HACK: This is a test to try and rate limit packet handling on Mono.
1619 // If it works, a more elegant solution can be devised 1620 // If it works, a more elegant solution can be devised
1620 if (Util.FireAndForgetCount() < 2) 1621 if (Util.FireAndForgetCount() < 2)
@@ -1622,6 +1623,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1622 //m_log.Debug("[LLUDPSERVER]: Incoming packet handler is sleeping"); 1623 //m_log.Debug("[LLUDPSERVER]: Incoming packet handler is sleeping");
1623 Thread.Sleep(30); 1624 Thread.Sleep(30);
1624 } 1625 }
1626 */
1625 1627
1626 if (packetInbox.Dequeue(100, ref incomingPacket)) 1628 if (packetInbox.Dequeue(100, ref incomingPacket))
1627 { 1629 {