diff options
author | John Hurliman | 2009-10-06 02:38:00 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-06 02:38:00 -0700 |
commit | e7c877407f2a72a9519eb53debca5aeef20cded9 (patch) | |
tree | ed67cb35522f357874f6e2749d66fd48493ede80 /OpenSim/Region/ClientStack/LindenUDP/LLQueItem.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-thr... (diff) | |
download | opensim-SC_OLD-e7c877407f2a72a9519eb53debca5aeef20cded9.zip opensim-SC_OLD-e7c877407f2a72a9519eb53debca5aeef20cded9.tar.gz opensim-SC_OLD-e7c877407f2a72a9519eb53debca5aeef20cded9.tar.bz2 opensim-SC_OLD-e7c877407f2a72a9519eb53debca5aeef20cded9.tar.xz |
* Continued work on the new LLUDP implementation. Appears to be functioning, although not everything is reimplemented yet
* Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing
* Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively
* Fixed formatting for a MySQLAssetData error logging line
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/IncomingPacket.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/LLQueItem.cs) | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLQueItem.cs b/OpenSim/Region/ClientStack/LindenUDP/IncomingPacket.cs index 0ed2bc1..dc0d62a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLQueItem.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/IncomingPacket.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 | * |
@@ -26,24 +26,17 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenMetaverse.Packets; | ||
30 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenMetaverse; | ||
31 | using OpenMetaverse.Packets; | ||
31 | 32 | ||
32 | namespace OpenSim.Region.ClientStack.LindenUDP | 33 | namespace OpenSim.Region.ClientStack.LindenUDP |
33 | { | 34 | { |
34 | public class LLQueItem | 35 | public struct IncomingPacket |
35 | { | 36 | { |
36 | public LLQueItem() | 37 | /// <summary>Client this packet came from</summary> |
37 | { | 38 | public LLUDPClient Client; |
38 | } | 39 | /// <summary>Packet data that has been received</summary> |
39 | |||
40 | public Packet Packet; | 40 | public Packet Packet; |
41 | public bool Incoming; | ||
42 | public ThrottleOutPacketType throttleType; | ||
43 | public int TickCount; | ||
44 | public Object Identifier; | ||
45 | public int Resends; | ||
46 | public int Length; | ||
47 | public uint Sequence; | ||
48 | } | 41 | } |
49 | } | 42 | } |