aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
diff options
context:
space:
mode:
authorMelanie2010-03-18 20:09:04 +0000
committerMelanie2010-03-18 20:09:04 +0000
commit4c2a51b1b5e2169e0f336c56a023c35bcc334cbd (patch)
tree9fbaf708764f315034a283fd8fedc8afe0864d75 /OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
parentMerge branch 'careminster' into careminster-presence-refactor (diff)
parentFlesh out the new permission method (diff)
downloadopensim-SC_OLD-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.zip
opensim-SC_OLD-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.gz
opensim-SC_OLD-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.bz2
opensim-SC_OLD-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 36d24e8..850474d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -1020,7 +1020,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1020 1020
1021 // Handle outgoing packets, resends, acknowledgements, and pings for each 1021 // Handle outgoing packets, resends, acknowledgements, and pings for each
1022 // client. m_packetSent will be set to true if a packet is sent 1022 // client. m_packetSent will be set to true if a packet is sent
1023 m_scene.ForEachClient(clientPacketHandler, false); 1023 m_scene.ForEachClient(clientPacketHandler);
1024 1024
1025 // If nothing was sent, sleep for the minimum amount of time before a 1025 // If nothing was sent, sleep for the minimum amount of time before a
1026 // token bucket could get more tokens 1026 // token bucket could get more tokens