diff --git a/LibreMetaverse/_Packets_.cs b/LibreMetaverse/_Packets_.cs
index 5b702e91..bc801bd5 100644
--- a/LibreMetaverse/_Packets_.cs
+++ b/LibreMetaverse/_Packets_.cs
@@ -597,9 +597,6 @@ namespace OpenMetaverse.Packets
ObjectIncludeInSearch = 65960,
RezRestoreToWorld = 65961,
LinkInventoryItem = 65962,
- RetrieveIMsExtended = 65963,
- JoinGroupRequestExtended = 65964,
- CreateGroupRequestExtended = 65965,
PacketAck = 131067,
OpenCircuit = 131068,
CloseCircuit = 131069,
@@ -1024,9 +1021,6 @@ namespace OpenMetaverse.Packets
case 424: return PacketType.ObjectIncludeInSearch;
case 425: return PacketType.RezRestoreToWorld;
case 426: return PacketType.LinkInventoryItem;
- case 427: return PacketType.RetrieveIMsExtended;
- case 428: return PacketType.JoinGroupRequestExtended;
- case 429: return PacketType.CreateGroupRequestExtended;
case 65531: return PacketType.PacketAck;
case 65532: return PacketType.OpenCircuit;
case 65533: return PacketType.CloseCircuit;
@@ -1471,9 +1465,6 @@ namespace OpenMetaverse.Packets
if(type == PacketType.ObjectIncludeInSearch) return new ObjectIncludeInSearchPacket();
if(type == PacketType.RezRestoreToWorld) return new RezRestoreToWorldPacket();
if(type == PacketType.LinkInventoryItem) return new LinkInventoryItemPacket();
- if(type == PacketType.RetrieveIMsExtended) return new RetrieveIMsExtendedPacket();
- if(type == PacketType.JoinGroupRequestExtended) return new JoinGroupRequestExtendedPacket();
- if(type == PacketType.CreateGroupRequestExtended) return new CreateGroupRequestExtendedPacket();
if(type == PacketType.PacketAck) return new PacketAckPacket();
if(type == PacketType.OpenCircuit) return new OpenCircuitPacket();
if(type == PacketType.CloseCircuit) return new CloseCircuitPacket();
@@ -1842,9 +1833,6 @@ namespace OpenMetaverse.Packets
case 424: return new ObjectIncludeInSearchPacket(header, bytes, ref i);
case 425: return new RezRestoreToWorldPacket(header, bytes, ref i);
case 426: return new LinkInventoryItemPacket(header, bytes, ref i);
- case 427: return new RetrieveIMsExtendedPacket(header, bytes, ref i);
- case 428: return new JoinGroupRequestExtendedPacket(header, bytes, ref i);
- case 429: return new CreateGroupRequestExtendedPacket(header, bytes, ref i);
case 65531: return new PacketAckPacket(header, bytes, ref i);
case 65532: return new OpenCircuitPacket(header, bytes, ref i);
case 65533: return new CloseCircuitPacket(header, bytes, ref i);
@@ -23701,60 +23689,19 @@ namespace OpenMetaverse.Packets
}
- ///
- public sealed class AgentInfoBlock : PacketBlock
- {
- public UUID AgentID;
-
- public override int Length
- {
- get
- {
- return 16;
- }
- }
-
- public AgentInfoBlock() { }
- public AgentInfoBlock(byte[] bytes, ref int i)
- {
- FromBytes(bytes, ref i);
- }
-
- public override void FromBytes(byte[] bytes, ref int i)
- {
- try
- {
- AgentID.FromBytes(bytes, i); i += 16;
- }
- catch (Exception)
- {
- throw new MalformedDataException();
- }
- }
-
- public override void ToBytes(byte[] bytes, ref int i)
- {
- AgentID.ToBytes(bytes, i); i += 16;
- }
-
- }
-
public override int Length
{
get
{
- int length = 12;
+ int length = 11;
length += AlertData.Length;
for (int j = 0; j < AlertInfo.Length; j++)
length += AlertInfo[j].Length;
- for (int j = 0; j < AgentInfo.Length; j++)
- length += AgentInfo[j].Length;
return length;
}
}
public AlertDataBlock AlertData;
public AlertInfoBlock[] AlertInfo;
- public AgentInfoBlock[] AgentInfo;
public AlertMessagePacket()
{
@@ -23766,7 +23713,6 @@ namespace OpenMetaverse.Packets
Header.Reliable = true;
AlertData = new AlertDataBlock();
AlertInfo = null;
- AgentInfo = null;
}
public AlertMessagePacket(byte[] bytes, ref int i) : this()
@@ -23792,14 +23738,6 @@ namespace OpenMetaverse.Packets
}
for (int j = 0; j < count; j++)
{ AlertInfo[j].FromBytes(bytes, ref i); }
- count = (int)bytes[i++];
- if(AgentInfo == null || AgentInfo.Length != -1) {
- AgentInfo = new AgentInfoBlock[count];
- for(int j = 0; j < count; j++)
- { AgentInfo[j] = new AgentInfoBlock(); }
- }
- for (int j = 0; j < count; j++)
- { AgentInfo[j].FromBytes(bytes, ref i); }
}
public AlertMessagePacket(Header head, byte[] bytes, ref int i): this()
@@ -23820,14 +23758,6 @@ namespace OpenMetaverse.Packets
}
for (int j = 0; j < count; j++)
{ AlertInfo[j].FromBytes(bytes, ref i); }
- count = (int)bytes[i++];
- if(AgentInfo == null || AgentInfo.Length != count) {
- AgentInfo = new AgentInfoBlock[count];
- for(int j = 0; j < count; j++)
- { AgentInfo[j] = new AgentInfoBlock(); }
- }
- for (int j = 0; j < count; j++)
- { AgentInfo[j].FromBytes(bytes, ref i); }
}
public override byte[] ToBytes()
@@ -23836,8 +23766,6 @@ namespace OpenMetaverse.Packets
length += AlertData.Length;
length++;
for (int j = 0; j < AlertInfo.Length; j++) { length += AlertInfo[j].Length; }
- length++;
- for (int j = 0; j < AgentInfo.Length; j++) { length += AgentInfo[j].Length; }
if (Header.AckList != null && Header.AckList.Length > 0) { length += Header.AckList.Length * 4 + 1; }
byte[] bytes = new byte[length];
int i = 0;
@@ -23845,8 +23773,6 @@ namespace OpenMetaverse.Packets
AlertData.ToBytes(bytes, ref i);
bytes[i++] = (byte)AlertInfo.Length;
for (int j = 0; j < AlertInfo.Length; j++) { AlertInfo[j].ToBytes(bytes, ref i); }
- bytes[i++] = (byte)AgentInfo.Length;
- for (int j = 0; j < AgentInfo.Length; j++) { AgentInfo[j].ToBytes(bytes, ref i); }
if (Header.AckList != null && Header.AckList.Length > 0) { Header.AcksToBytes(bytes, ref i); }
return bytes;
}
@@ -23869,15 +23795,13 @@ namespace OpenMetaverse.Packets
byte[] fixedBytes = new byte[fixedLength];
Header.ToBytes(fixedBytes, ref i);
AlertData.ToBytes(fixedBytes, ref i);
- fixedLength += 2;
+ fixedLength += 1;
int AlertInfoStart = 0;
- int AgentInfoStart = 0;
do
{
int variableLength = 0;
int AlertInfoCount = 0;
- int AgentInfoCount = 0;
i = AlertInfoStart;
while (fixedLength + variableLength + acksLength < Packet.MTU && i < AlertInfo.Length) {
@@ -23890,17 +23814,6 @@ namespace OpenMetaverse.Packets
++i;
}
- i = AgentInfoStart;
- while (fixedLength + variableLength + acksLength < Packet.MTU && i < AgentInfo.Length) {
- int blockLength = AgentInfo[i].Length;
- if (fixedLength + variableLength + blockLength + acksLength <= MTU || i == AgentInfoStart) {
- variableLength += blockLength;
- ++AgentInfoCount;
- }
- else { break; }
- ++i;
- }
-
byte[] packet = new byte[fixedLength + variableLength + acksLength];
int length = fixedBytes.Length;
Buffer.BlockCopy(fixedBytes, 0, packet, 0, length);
@@ -23910,10 +23823,6 @@ namespace OpenMetaverse.Packets
for (i = AlertInfoStart; i < AlertInfoStart + AlertInfoCount; i++) { AlertInfo[i].ToBytes(packet, ref length); }
AlertInfoStart += AlertInfoCount;
- packet[length++] = (byte)AgentInfoCount;
- for (i = AgentInfoStart; i < AgentInfoStart + AgentInfoCount; i++) { AgentInfo[i].ToBytes(packet, ref length); }
- AgentInfoStart += AgentInfoCount;
-
if (acksLength > 0) {
Buffer.BlockCopy(ackBytes, 0, packet, length, acksLength);
acksLength = 0;
@@ -23921,8 +23830,7 @@ namespace OpenMetaverse.Packets
packets.Add(packet);
} while (
- AlertInfoStart < AlertInfo.Length ||
- AgentInfoStart < AgentInfo.Length);
+ AlertInfoStart < AlertInfo.Length);
return packets.ToArray();
}
@@ -41721,44 +41629,6 @@ namespace OpenMetaverse.Packets
}
- ///
- public sealed class EstateBlockBlock : PacketBlock
- {
- public uint EstateID;
-
- public override int Length
- {
- get
- {
- return 4;
- }
- }
-
- public EstateBlockBlock() { }
- public EstateBlockBlock(byte[] bytes, ref int i)
- {
- FromBytes(bytes, ref i);
- }
-
- public override void FromBytes(byte[] bytes, ref int i)
- {
- try
- {
- EstateID = (uint)(bytes[i++] + (bytes[i++] << 8) + (bytes[i++] << 16) + (bytes[i++] << 24));
- }
- catch (Exception)
- {
- throw new MalformedDataException();
- }
- }
-
- public override void ToBytes(byte[] bytes, ref int i)
- {
- Utils.UIntToBytes(EstateID, bytes, i); i += 4;
- }
-
- }
-
public override int Length
{
get
@@ -41766,13 +41636,11 @@ namespace OpenMetaverse.Packets
int length = 10;
length += AgentData.Length;
length += MessageBlock.Length;
- length += EstateBlock.Length;
return length;
}
}
public AgentDataBlock AgentData;
public MessageBlockBlock MessageBlock;
- public EstateBlockBlock EstateBlock;
public ImprovedInstantMessagePacket()
{
@@ -41785,7 +41653,6 @@ namespace OpenMetaverse.Packets
Header.Zerocoded = true;
AgentData = new AgentDataBlock();
MessageBlock = new MessageBlockBlock();
- EstateBlock = new EstateBlockBlock();
}
public ImprovedInstantMessagePacket(byte[] bytes, ref int i) : this()
@@ -41804,7 +41671,6 @@ namespace OpenMetaverse.Packets
}
AgentData.FromBytes(bytes, ref i);
MessageBlock.FromBytes(bytes, ref i);
- EstateBlock.FromBytes(bytes, ref i);
}
public ImprovedInstantMessagePacket(Header head, byte[] bytes, ref int i): this()
@@ -41818,7 +41684,6 @@ namespace OpenMetaverse.Packets
Header = header;
AgentData.FromBytes(bytes, ref i);
MessageBlock.FromBytes(bytes, ref i);
- EstateBlock.FromBytes(bytes, ref i);
}
public override byte[] ToBytes()
@@ -41826,14 +41691,12 @@ namespace OpenMetaverse.Packets
int length = 10;
length += AgentData.Length;
length += MessageBlock.Length;
- length += EstateBlock.Length;
if (Header.AckList != null && Header.AckList.Length > 0) { length += Header.AckList.Length * 4 + 1; }
byte[] bytes = new byte[length];
int i = 0;
Header.ToBytes(bytes, ref i);
AgentData.ToBytes(bytes, ref i);
MessageBlock.ToBytes(bytes, ref i);
- EstateBlock.ToBytes(bytes, ref i);
if (Header.AckList != null && Header.AckList.Length > 0) { Header.AcksToBytes(bytes, ref i); }
return bytes;
}
@@ -70486,479 +70349,6 @@ namespace OpenMetaverse.Packets
}
}
- ///
- public sealed class RetrieveIMsExtendedPacket : Packet
- {
- ///
- public sealed class AgentDataBlock : PacketBlock
- {
- public UUID AgentID;
- public UUID SessionID;
- public bool IsPremium;
-
- public override int Length
- {
- get
- {
- return 33;
- }
- }
-
- public AgentDataBlock() { }
- public AgentDataBlock(byte[] bytes, ref int i)
- {
- FromBytes(bytes, ref i);
- }
-
- public override void FromBytes(byte[] bytes, ref int i)
- {
- try
- {
- AgentID.FromBytes(bytes, i); i += 16;
- SessionID.FromBytes(bytes, i); i += 16;
- IsPremium = (bytes[i++] != 0) ? (bool)true : (bool)false;
- }
- catch (Exception)
- {
- throw new MalformedDataException();
- }
- }
-
- public override void ToBytes(byte[] bytes, ref int i)
- {
- AgentID.ToBytes(bytes, i); i += 16;
- SessionID.ToBytes(bytes, i); i += 16;
- bytes[i++] = (byte)((IsPremium) ? 1 : 0);
- }
-
- }
-
- public override int Length
- {
- get
- {
- int length = 10;
- length += AgentData.Length;
- return length;
- }
- }
- public AgentDataBlock AgentData;
-
- public RetrieveIMsExtendedPacket()
- {
- HasVariableBlocks = false;
- Type = PacketType.RetrieveIMsExtended;
- Header = new Header();
- Header.Frequency = PacketFrequency.Low;
- Header.ID = 427;
- Header.Reliable = true;
- AgentData = new AgentDataBlock();
- }
-
- public RetrieveIMsExtendedPacket(byte[] bytes, ref int i) : this()
- {
- int packetEnd = bytes.Length - 1;
- FromBytes(bytes, ref i, ref packetEnd, null);
- }
-
- override public void FromBytes(byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer)
- {
- Header.FromBytes(bytes, ref i, ref packetEnd);
- if (Header.Zerocoded && zeroBuffer != null)
- {
- packetEnd = Helpers.ZeroDecode(bytes, packetEnd + 1, zeroBuffer) - 1;
- bytes = zeroBuffer;
- }
- AgentData.FromBytes(bytes, ref i);
- }
-
- public RetrieveIMsExtendedPacket(Header head, byte[] bytes, ref int i): this()
- {
- int packetEnd = bytes.Length - 1;
- FromBytes(head, bytes, ref i, ref packetEnd);
- }
-
- override public void FromBytes(Header header, byte[] bytes, ref int i, ref int packetEnd)
- {
- Header = header;
- AgentData.FromBytes(bytes, ref i);
- }
-
- public override byte[] ToBytes()
- {
- int length = 10;
- length += AgentData.Length;
- if (Header.AckList != null && Header.AckList.Length > 0) { length += Header.AckList.Length * 4 + 1; }
- byte[] bytes = new byte[length];
- int i = 0;
- Header.ToBytes(bytes, ref i);
- AgentData.ToBytes(bytes, ref i);
- if (Header.AckList != null && Header.AckList.Length > 0) { Header.AcksToBytes(bytes, ref i); }
- return bytes;
- }
-
- public override byte[][] ToBytesMultiple()
- {
- return new byte[][] { ToBytes() };
- }
- }
-
- ///
- public sealed class JoinGroupRequestExtendedPacket : Packet
- {
- ///
- public sealed class AgentDataBlock : PacketBlock
- {
- public UUID AgentID;
- public UUID SessionID;
- public int GroupLimit;
-
- public override int Length
- {
- get
- {
- return 36;
- }
- }
-
- public AgentDataBlock() { }
- public AgentDataBlock(byte[] bytes, ref int i)
- {
- FromBytes(bytes, ref i);
- }
-
- public override void FromBytes(byte[] bytes, ref int i)
- {
- try
- {
- AgentID.FromBytes(bytes, i); i += 16;
- SessionID.FromBytes(bytes, i); i += 16;
- GroupLimit = (int)(bytes[i++] + (bytes[i++] << 8) + (bytes[i++] << 16) + (bytes[i++] << 24));
- }
- catch (Exception)
- {
- throw new MalformedDataException();
- }
- }
-
- public override void ToBytes(byte[] bytes, ref int i)
- {
- AgentID.ToBytes(bytes, i); i += 16;
- SessionID.ToBytes(bytes, i); i += 16;
- Utils.IntToBytes(GroupLimit, bytes, i); i += 4;
- }
-
- }
-
- ///
- public sealed class GroupDataBlock : PacketBlock
- {
- public UUID GroupID;
-
- public override int Length
- {
- get
- {
- return 16;
- }
- }
-
- public GroupDataBlock() { }
- public GroupDataBlock(byte[] bytes, ref int i)
- {
- FromBytes(bytes, ref i);
- }
-
- public override void FromBytes(byte[] bytes, ref int i)
- {
- try
- {
- GroupID.FromBytes(bytes, i); i += 16;
- }
- catch (Exception)
- {
- throw new MalformedDataException();
- }
- }
-
- public override void ToBytes(byte[] bytes, ref int i)
- {
- GroupID.ToBytes(bytes, i); i += 16;
- }
-
- }
-
- public override int Length
- {
- get
- {
- int length = 10;
- length += AgentData.Length;
- length += GroupData.Length;
- return length;
- }
- }
- public AgentDataBlock AgentData;
- public GroupDataBlock GroupData;
-
- public JoinGroupRequestExtendedPacket()
- {
- HasVariableBlocks = false;
- Type = PacketType.JoinGroupRequestExtended;
- Header = new Header();
- Header.Frequency = PacketFrequency.Low;
- Header.ID = 428;
- Header.Reliable = true;
- AgentData = new AgentDataBlock();
- GroupData = new GroupDataBlock();
- }
-
- public JoinGroupRequestExtendedPacket(byte[] bytes, ref int i) : this()
- {
- int packetEnd = bytes.Length - 1;
- FromBytes(bytes, ref i, ref packetEnd, null);
- }
-
- override public void FromBytes(byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer)
- {
- Header.FromBytes(bytes, ref i, ref packetEnd);
- if (Header.Zerocoded && zeroBuffer != null)
- {
- packetEnd = Helpers.ZeroDecode(bytes, packetEnd + 1, zeroBuffer) - 1;
- bytes = zeroBuffer;
- }
- AgentData.FromBytes(bytes, ref i);
- GroupData.FromBytes(bytes, ref i);
- }
-
- public JoinGroupRequestExtendedPacket(Header head, byte[] bytes, ref int i): this()
- {
- int packetEnd = bytes.Length - 1;
- FromBytes(head, bytes, ref i, ref packetEnd);
- }
-
- override public void FromBytes(Header header, byte[] bytes, ref int i, ref int packetEnd)
- {
- Header = header;
- AgentData.FromBytes(bytes, ref i);
- GroupData.FromBytes(bytes, ref i);
- }
-
- public override byte[] ToBytes()
- {
- int length = 10;
- length += AgentData.Length;
- length += GroupData.Length;
- if (Header.AckList != null && Header.AckList.Length > 0) { length += Header.AckList.Length * 4 + 1; }
- byte[] bytes = new byte[length];
- int i = 0;
- Header.ToBytes(bytes, ref i);
- AgentData.ToBytes(bytes, ref i);
- GroupData.ToBytes(bytes, ref i);
- if (Header.AckList != null && Header.AckList.Length > 0) { Header.AcksToBytes(bytes, ref i); }
- return bytes;
- }
-
- public override byte[][] ToBytesMultiple()
- {
- return new byte[][] { ToBytes() };
- }
- }
-
- ///
- public sealed class CreateGroupRequestExtendedPacket : Packet
- {
- ///
- public sealed class AgentDataBlock : PacketBlock
- {
- public UUID AgentID;
- public UUID SessionID;
- public int GroupLimit;
-
- public override int Length
- {
- get
- {
- return 36;
- }
- }
-
- public AgentDataBlock() { }
- public AgentDataBlock(byte[] bytes, ref int i)
- {
- FromBytes(bytes, ref i);
- }
-
- public override void FromBytes(byte[] bytes, ref int i)
- {
- try
- {
- AgentID.FromBytes(bytes, i); i += 16;
- SessionID.FromBytes(bytes, i); i += 16;
- GroupLimit = (int)(bytes[i++] + (bytes[i++] << 8) + (bytes[i++] << 16) + (bytes[i++] << 24));
- }
- catch (Exception)
- {
- throw new MalformedDataException();
- }
- }
-
- public override void ToBytes(byte[] bytes, ref int i)
- {
- AgentID.ToBytes(bytes, i); i += 16;
- SessionID.ToBytes(bytes, i); i += 16;
- Utils.IntToBytes(GroupLimit, bytes, i); i += 4;
- }
-
- }
-
- ///
- public sealed class GroupDataBlock : PacketBlock
- {
- public byte[] Name;
- public byte[] Charter;
- public bool ShowInList;
- public UUID InsigniaID;
- public int MembershipFee;
- public bool OpenEnrollment;
- public bool AllowPublish;
- public bool MaturePublish;
-
- public override int Length
- {
- get
- {
- int length = 27;
- if (Name != null) { length += Name.Length; }
- if (Charter != null) { length += Charter.Length; }
- return length;
- }
- }
-
- public GroupDataBlock() { }
- public GroupDataBlock(byte[] bytes, ref int i)
- {
- FromBytes(bytes, ref i);
- }
-
- public override void FromBytes(byte[] bytes, ref int i)
- {
- int length;
- try
- {
- length = bytes[i++];
- Name = new byte[length];
- Buffer.BlockCopy(bytes, i, Name, 0, length); i += length;
- length = (bytes[i++] + (bytes[i++] << 8));
- Charter = new byte[length];
- Buffer.BlockCopy(bytes, i, Charter, 0, length); i += length;
- ShowInList = (bytes[i++] != 0) ? (bool)true : (bool)false;
- InsigniaID.FromBytes(bytes, i); i += 16;
- MembershipFee = (int)(bytes[i++] + (bytes[i++] << 8) + (bytes[i++] << 16) + (bytes[i++] << 24));
- OpenEnrollment = (bytes[i++] != 0) ? (bool)true : (bool)false;
- AllowPublish = (bytes[i++] != 0) ? (bool)true : (bool)false;
- MaturePublish = (bytes[i++] != 0) ? (bool)true : (bool)false;
- }
- catch (Exception)
- {
- throw new MalformedDataException();
- }
- }
-
- public override void ToBytes(byte[] bytes, ref int i)
- {
- bytes[i++] = (byte)Name.Length;
- Buffer.BlockCopy(Name, 0, bytes, i, Name.Length); i += Name.Length;
- bytes[i++] = (byte)(Charter.Length % 256);
- bytes[i++] = (byte)((Charter.Length >> 8) % 256);
- Buffer.BlockCopy(Charter, 0, bytes, i, Charter.Length); i += Charter.Length;
- bytes[i++] = (byte)((ShowInList) ? 1 : 0);
- InsigniaID.ToBytes(bytes, i); i += 16;
- Utils.IntToBytes(MembershipFee, bytes, i); i += 4;
- bytes[i++] = (byte)((OpenEnrollment) ? 1 : 0);
- bytes[i++] = (byte)((AllowPublish) ? 1 : 0);
- bytes[i++] = (byte)((MaturePublish) ? 1 : 0);
- }
-
- }
-
- public override int Length
- {
- get
- {
- int length = 10;
- length += AgentData.Length;
- length += GroupData.Length;
- return length;
- }
- }
- public AgentDataBlock AgentData;
- public GroupDataBlock GroupData;
-
- public CreateGroupRequestExtendedPacket()
- {
- HasVariableBlocks = false;
- Type = PacketType.CreateGroupRequestExtended;
- Header = new Header();
- Header.Frequency = PacketFrequency.Low;
- Header.ID = 429;
- Header.Reliable = true;
- AgentData = new AgentDataBlock();
- GroupData = new GroupDataBlock();
- }
-
- public CreateGroupRequestExtendedPacket(byte[] bytes, ref int i) : this()
- {
- int packetEnd = bytes.Length - 1;
- FromBytes(bytes, ref i, ref packetEnd, null);
- }
-
- override public void FromBytes(byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer)
- {
- Header.FromBytes(bytes, ref i, ref packetEnd);
- if (Header.Zerocoded && zeroBuffer != null)
- {
- packetEnd = Helpers.ZeroDecode(bytes, packetEnd + 1, zeroBuffer) - 1;
- bytes = zeroBuffer;
- }
- AgentData.FromBytes(bytes, ref i);
- GroupData.FromBytes(bytes, ref i);
- }
-
- public CreateGroupRequestExtendedPacket(Header head, byte[] bytes, ref int i): this()
- {
- int packetEnd = bytes.Length - 1;
- FromBytes(head, bytes, ref i, ref packetEnd);
- }
-
- override public void FromBytes(Header header, byte[] bytes, ref int i, ref int packetEnd)
- {
- Header = header;
- AgentData.FromBytes(bytes, ref i);
- GroupData.FromBytes(bytes, ref i);
- }
-
- public override byte[] ToBytes()
- {
- int length = 10;
- length += AgentData.Length;
- length += GroupData.Length;
- if (Header.AckList != null && Header.AckList.Length > 0) { length += Header.AckList.Length * 4 + 1; }
- byte[] bytes = new byte[length];
- int i = 0;
- Header.ToBytes(bytes, ref i);
- AgentData.ToBytes(bytes, ref i);
- GroupData.ToBytes(bytes, ref i);
- if (Header.AckList != null && Header.AckList.Length > 0) { Header.AcksToBytes(bytes, ref i); }
- return bytes;
- }
-
- public override byte[][] ToBytesMultiple()
- {
- return new byte[][] { ToBytes() };
- }
- }
-
///
public sealed class PacketAckPacket : Packet
{
@@ -78629,44 +78019,6 @@ namespace OpenMetaverse.Packets
}
- ///
- public sealed class RegionAllowAccessBlockBlock : PacketBlock
- {
- public bool RegionAllowAccessOverride;
-
- public override int Length
- {
- get
- {
- return 1;
- }
- }
-
- public RegionAllowAccessBlockBlock() { }
- public RegionAllowAccessBlockBlock(byte[] bytes, ref int i)
- {
- FromBytes(bytes, ref i);
- }
-
- public override void FromBytes(byte[] bytes, ref int i)
- {
- try
- {
- RegionAllowAccessOverride = (bytes[i++] != 0) ? (bool)true : (bool)false;
- }
- catch (Exception)
- {
- throw new MalformedDataException();
- }
- }
-
- public override void ToBytes(byte[] bytes, ref int i)
- {
- bytes[i++] = (byte)((RegionAllowAccessOverride) ? 1 : 0);
- }
-
- }
-
public override int Length
{
get
@@ -79281,17 +78633,6 @@ namespace OpenMetaverse.Packets
++i;
}
- i = AgentInventoryHostStart;
- while (fixedLength + variableLength + acksLength < Packet.MTU && i < AgentInventoryHost.Length) {
- int blockLength = AgentInventoryHost[i].Length;
- if (fixedLength + variableLength + blockLength + acksLength <= MTU || i == AgentInventoryHostStart) {
- variableLength += blockLength;
- ++AgentInventoryHostCount;
- }
- else { break; }
- ++i;
- }
-
byte[] packet = new byte[fixedLength + variableLength + acksLength];
int length = fixedBytes.Length;
Buffer.BlockCopy(fixedBytes, 0, packet, 0, length);
@@ -80063,13 +79404,11 @@ namespace OpenMetaverse.Packets
int length = 7;
length += ParcelData.Length;
length += AgeVerificationBlock.Length;
- length += RegionAllowAccessBlock.Length;
return length;
}
}
public ParcelDataBlock ParcelData;
public AgeVerificationBlockBlock AgeVerificationBlock;
- public RegionAllowAccessBlockBlock RegionAllowAccessBlock;
public ParcelPropertiesPacket()
{
@@ -80082,7 +79421,6 @@ namespace OpenMetaverse.Packets
Header.Zerocoded = true;
ParcelData = new ParcelDataBlock();
AgeVerificationBlock = new AgeVerificationBlockBlock();
- RegionAllowAccessBlock = new RegionAllowAccessBlockBlock();
}
public ParcelPropertiesPacket(byte[] bytes, ref int i) : this()
@@ -80101,7 +79439,6 @@ namespace OpenMetaverse.Packets
}
ParcelData.FromBytes(bytes, ref i);
AgeVerificationBlock.FromBytes(bytes, ref i);
- RegionAllowAccessBlock.FromBytes(bytes, ref i);
}
public ParcelPropertiesPacket(Header head, byte[] bytes, ref int i): this()
@@ -80115,7 +79452,6 @@ namespace OpenMetaverse.Packets
Header = header;
ParcelData.FromBytes(bytes, ref i);
AgeVerificationBlock.FromBytes(bytes, ref i);
- RegionAllowAccessBlock.FromBytes(bytes, ref i);
}
public override byte[] ToBytes()
@@ -80123,14 +79459,12 @@ namespace OpenMetaverse.Packets
int length = 7;
length += ParcelData.Length;
length += AgeVerificationBlock.Length;
- length += RegionAllowAccessBlock.Length;
if (Header.AckList != null && Header.AckList.Length > 0) { length += Header.AckList.Length * 4 + 1; }
byte[] bytes = new byte[length];
int i = 0;
Header.ToBytes(bytes, ref i);
ParcelData.ToBytes(bytes, ref i);
AgeVerificationBlock.ToBytes(bytes, ref i);
- RegionAllowAccessBlock.ToBytes(bytes, ref i);
if (Header.AckList != null && Header.AckList.Length > 0) { Header.AcksToBytes(bytes, ref i); }
return bytes;
}
@@ -80584,55 +79918,11 @@ namespace OpenMetaverse.Packets
}
- ///
- public sealed class AgentInventoryHostBlock : PacketBlock
- {
- public byte[] InventoryHost;
-
- public override int Length
- {
- get
- {
- int length = 1;
- if (InventoryHost != null) { length += InventoryHost.Length; }
- return length;
- }
- }
-
- public AgentInventoryHostBlock() { }
- public AgentInventoryHostBlock(byte[] bytes, ref int i)
- {
- FromBytes(bytes, ref i);
- }
-
- public override void FromBytes(byte[] bytes, ref int i)
- {
- int length;
- try
- {
- length = bytes[i++];
- InventoryHost = new byte[length];
- Buffer.BlockCopy(bytes, i, InventoryHost, 0, length); i += length;
- }
- catch (Exception)
- {
- throw new MalformedDataException();
- }
- }
-
- public override void ToBytes(byte[] bytes, ref int i)
- {
- bytes[i++] = (byte)InventoryHost.Length;
- Buffer.BlockCopy(InventoryHost, 0, bytes, i, InventoryHost.Length); i += InventoryHost.Length;
- }
-
- }
-
public override int Length
{
get
{
- int length = 15;
+ int length = 14;
length += AgentData.Length;
for (int j = 0; j < GroupData.Length; j++)
length += GroupData[j].Length;
@@ -80648,8 +79938,6 @@ namespace OpenMetaverse.Packets
length += AgentAccess[j].Length;
for (int j = 0; j < AgentInfo.Length; j++)
length += AgentInfo[j].Length;
- for (int j = 0; j < AgentInventoryHost.Length; j++)
- length += AgentInventoryHost[j].Length;
return length;
}
}
@@ -80661,7 +79949,6 @@ namespace OpenMetaverse.Packets
public VisualParamBlock[] VisualParam;
public AgentAccessBlock[] AgentAccess;
public AgentInfoBlock[] AgentInfo;
- public AgentInventoryHostBlock[] AgentInventoryHost;
public ChildAgentUpdatePacket()
{
@@ -80680,7 +79967,6 @@ namespace OpenMetaverse.Packets
VisualParam = null;
AgentAccess = null;
AgentInfo = null;
- AgentInventoryHost = null;
}
public ChildAgentUpdatePacket(byte[] bytes, ref int i) : this()
@@ -80754,14 +80040,6 @@ namespace OpenMetaverse.Packets
}
for (int j = 0; j < count; j++)
{ AgentInfo[j].FromBytes(bytes, ref i); }
- count = (int)bytes[i++];
- if(AgentInventoryHost == null || AgentInventoryHost.Length != -1) {
- AgentInventoryHost = new AgentInventoryHostBlock[count];
- for(int j = 0; j < count; j++)
- { AgentInventoryHost[j] = new AgentInventoryHostBlock(); }
- }
- for (int j = 0; j < count; j++)
- { AgentInventoryHost[j].FromBytes(bytes, ref i); }
}
public ChildAgentUpdatePacket(Header head, byte[] bytes, ref int i): this()
@@ -80830,14 +80108,6 @@ namespace OpenMetaverse.Packets
}
for (int j = 0; j < count; j++)
{ AgentInfo[j].FromBytes(bytes, ref i); }
- count = (int)bytes[i++];
- if(AgentInventoryHost == null || AgentInventoryHost.Length != count) {
- AgentInventoryHost = new AgentInventoryHostBlock[count];
- for(int j = 0; j < count; j++)
- { AgentInventoryHost[j] = new AgentInventoryHostBlock(); }
- }
- for (int j = 0; j < count; j++)
- { AgentInventoryHost[j].FromBytes(bytes, ref i); }
}
public override byte[] ToBytes()
@@ -80858,8 +80128,6 @@ namespace OpenMetaverse.Packets
for (int j = 0; j < AgentAccess.Length; j++) { length += AgentAccess[j].Length; }
length++;
for (int j = 0; j < AgentInfo.Length; j++) { length += AgentInfo[j].Length; }
- length++;
- for (int j = 0; j < AgentInventoryHost.Length; j++) { length += AgentInventoryHost[j].Length; }
if (Header.AckList != null && Header.AckList.Length > 0) { length += Header.AckList.Length * 4 + 1; }
byte[] bytes = new byte[length];
int i = 0;
@@ -80879,8 +80147,6 @@ namespace OpenMetaverse.Packets
for (int j = 0; j < AgentAccess.Length; j++) { AgentAccess[j].ToBytes(bytes, ref i); }
bytes[i++] = (byte)AgentInfo.Length;
for (int j = 0; j < AgentInfo.Length; j++) { AgentInfo[j].ToBytes(bytes, ref i); }
- bytes[i++] = (byte)AgentInventoryHost.Length;
- for (int j = 0; j < AgentInventoryHost.Length; j++) { AgentInventoryHost[j].ToBytes(bytes, ref i); }
if (Header.AckList != null && Header.AckList.Length > 0) { Header.AcksToBytes(bytes, ref i); }
return bytes;
}
@@ -80903,7 +80169,7 @@ namespace OpenMetaverse.Packets
byte[] fixedBytes = new byte[fixedLength];
Header.ToBytes(fixedBytes, ref i);
AgentData.ToBytes(fixedBytes, ref i);
- fixedLength += 8;
+ fixedLength += 7;
int GroupDataStart = 0;
int AnimationDataStart = 0;
@@ -80912,7 +80178,6 @@ namespace OpenMetaverse.Packets
int VisualParamStart = 0;
int AgentAccessStart = 0;
int AgentInfoStart = 0;
- int AgentInventoryHostStart = 0;
do
{
int variableLength = 0;
@@ -80923,7 +80188,6 @@ namespace OpenMetaverse.Packets
int VisualParamCount = 0;
int AgentAccessCount = 0;
int AgentInfoCount = 0;
- int AgentInventoryHostCount = 0;
i = GroupDataStart;
while (fixedLength + variableLength + acksLength < Packet.MTU && i < GroupData.Length) {
@@ -81035,10 +80299,6 @@ namespace OpenMetaverse.Packets
for (i = AgentInfoStart; i < AgentInfoStart + AgentInfoCount; i++) { AgentInfo[i].ToBytes(packet, ref length); }
AgentInfoStart += AgentInfoCount;
- packet[length++] = (byte)AgentInventoryHostCount;
- for (i = AgentInventoryHostStart; i < AgentInventoryHostStart + AgentInventoryHostCount; i++) { AgentInventoryHost[i].ToBytes(packet, ref length); }
- AgentInventoryHostStart += AgentInventoryHostCount;
-
if (acksLength > 0) {
Buffer.BlockCopy(ackBytes, 0, packet, length, acksLength);
acksLength = 0;
@@ -81052,8 +80312,7 @@ namespace OpenMetaverse.Packets
NVPairDataStart < NVPairData.Length ||
VisualParamStart < VisualParam.Length ||
AgentAccessStart < AgentAccess.Length ||
- AgentInfoStart < AgentInfo.Length ||
- AgentInventoryHostStart < AgentInventoryHost.Length);
+ AgentInfoStart < AgentInfo.Length);
return packets.ToArray();
}