aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2009-12-02 00:36:53 +0000
committerMelanie2009-12-02 00:36:53 +0000
commitded16d35299b068c03c9b241e54ea5e7e7942308 (patch)
tree56e164bf2b4c53f0285824210281708a160495c7 /OpenSim/Region/ClientStack
parentEnforce physical prim max size on single prims. (diff)
parent* Test Autoconvert line ending on my repo.. (diff)
downloadopensim-SC-ded16d35299b068c03c9b241e54ea5e7e7942308.zip
opensim-SC-ded16d35299b068c03c9b241e54ea5e7e7942308.tar.gz
opensim-SC-ded16d35299b068c03c9b241e54ea5e7e7942308.tar.bz2
opensim-SC-ded16d35299b068c03c9b241e54ea5e7e7942308.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index 1e5f15a..55d9c9c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -430,7 +430,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
430 // Send the packet 430 // Send the packet
431 m_udpServer.SendPacketFinal(nextPacket); 431 m_udpServer.SendPacketFinal(nextPacket);
432 m_nextPackets[i] = null; 432 m_nextPackets[i] = null;
433 packetSent = true; 433 packetSent = true;
434 this.PacketsSent++; 434 this.PacketsSent++;
435 } 435 }
436 } 436 }