diff options
Diffstat (limited to 'OpenSim/Framework/PacketPool.cs')
-rw-r--r-- | OpenSim/Framework/PacketPool.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs index 31548a0..22f952a 100644 --- a/OpenSim/Framework/PacketPool.cs +++ b/OpenSim/Framework/PacketPool.cs | |||
@@ -26,8 +26,9 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Net; | ||
30 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Net; | ||
31 | using libsecondlife; | ||
31 | using libsecondlife.Packets; | 32 | using libsecondlife.Packets; |
32 | 33 | ||
33 | namespace OpenSim.Framework | 34 | namespace OpenSim.Framework |
@@ -115,13 +116,13 @@ namespace OpenSim.Framework | |||
115 | { | 116 | { |
116 | byte[] decoded_header = new byte[10 + 8]; | 117 | byte[] decoded_header = new byte[10 + 8]; |
117 | ushort id; | 118 | ushort id; |
118 | libsecondlife.PacketFrequency freq; | 119 | PacketFrequency freq; |
119 | 120 | ||
120 | Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10); | 121 | Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10); |
121 | 122 | ||
122 | if((bytes[0] & libsecondlife.Helpers.MSG_ZEROCODED)!=0) | 123 | if((bytes[0] & Helpers.MSG_ZEROCODED)!=0) |
123 | { | 124 | { |
124 | libsecondlife.Helpers.ZeroDecodeCommand(bytes, decoded_header); | 125 | Helpers.ZeroDecodeCommand(bytes, decoded_header); |
125 | } | 126 | } |
126 | 127 | ||
127 | if (decoded_header[6] == 0xFF) | 128 | if (decoded_header[6] == 0xFF) |
@@ -129,18 +130,18 @@ namespace OpenSim.Framework | |||
129 | if (decoded_header[7] == 0xFF) | 130 | if (decoded_header[7] == 0xFF) |
130 | { | 131 | { |
131 | id = (ushort)((decoded_header[8] << 8) + decoded_header[9]); | 132 | id = (ushort)((decoded_header[8] << 8) + decoded_header[9]); |
132 | freq = libsecondlife.PacketFrequency.Low; | 133 | freq = PacketFrequency.Low; |
133 | } | 134 | } |
134 | else | 135 | else |
135 | { | 136 | { |
136 | id = (ushort)decoded_header[7]; | 137 | id = (ushort)decoded_header[7]; |
137 | freq = libsecondlife.PacketFrequency.Medium; | 138 | freq = PacketFrequency.Medium; |
138 | } | 139 | } |
139 | } | 140 | } |
140 | else | 141 | else |
141 | { | 142 | { |
142 | id = (ushort)decoded_header[6]; | 143 | id = (ushort)decoded_header[6]; |
143 | freq = libsecondlife.PacketFrequency.High; | 144 | freq = PacketFrequency.High; |
144 | } | 145 | } |
145 | 146 | ||
146 | return Packet.GetType(id, freq); | 147 | return Packet.GetType(id, freq); |