diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/PacketPool.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Framework/PacketPool.cs')
-rw-r--r-- | OpenSim/Framework/PacketPool.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs index acd1425..27e74ca 100644 --- a/OpenSim/Framework/PacketPool.cs +++ b/OpenSim/Framework/PacketPool.cs | |||
@@ -28,8 +28,8 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Net; | 30 | using System.Net; |
31 | using libsecondlife; | 31 | using OpenMetaverse; |
32 | using libsecondlife.Packets; | 32 | using OpenMetaverse.Packets; |
33 | 33 | ||
34 | namespace OpenSim.Framework | 34 | namespace OpenSim.Framework |
35 | { | 35 | { |
@@ -76,11 +76,13 @@ namespace OpenSim.Framework | |||
76 | ushort id; | 76 | ushort id; |
77 | PacketFrequency freq; | 77 | PacketFrequency freq; |
78 | 78 | ||
79 | Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10); | ||
80 | |||
81 | if ((bytes[0] & Helpers.MSG_ZEROCODED) != 0) | 79 | if ((bytes[0] & Helpers.MSG_ZEROCODED) != 0) |
82 | { | 80 | { |
83 | Helpers.ZeroDecodeCommand(bytes, decoded_header); | 81 | Helpers.ZeroDecode(bytes, 16, decoded_header); |
82 | } | ||
83 | else | ||
84 | { | ||
85 | Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10); | ||
84 | } | 86 | } |
85 | 87 | ||
86 | if (decoded_header[6] == 0xFF) | 88 | if (decoded_header[6] == 0xFF) |