Merge branch 'master' into careminster

This commit is contained in:
Melanie
2009-12-02 00:36:53 +00:00
8 changed files with 66 additions and 74 deletions

View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
@@ -430,7 +430,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Send the packet
m_udpServer.SendPacketFinal(nextPacket);
m_nextPackets[i] = null;
packetSent = true;
packetSent = true;
this.PacketsSent++;
}
}