diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 05ebcac..4acc6be 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2893,10 +2893,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2893 | if (rotation.X == rotation.Y && rotation.Y == rotation.Z && rotation.Z == rotation.W && rotation.W == 0) | 2893 | if (rotation.X == rotation.Y && rotation.Y == rotation.Z && rotation.Z == rotation.W && rotation.W == 0) |
2894 | rotation = Quaternion.Identity; | 2894 | rotation = Quaternion.Identity; |
2895 | 2895 | ||
2896 | ObjectUpdatePacket.ObjectDataBlock objectData = | 2896 | ObjectUpdatePacket.ObjectDataBlock objectData = CreatePrimUpdateBlock(primShape, flags); |
2897 | new ObjectUpdatePacket.ObjectDataBlock(); | ||
2898 | |||
2899 | objectData = CreatePrimUpdateBlock(primShape, flags); | ||
2900 | 2897 | ||
2901 | objectData.ID = localID; | 2898 | objectData.ID = localID; |
2902 | objectData.FullID = objectID; | 2899 | objectData.FullID = objectID; |
@@ -3655,7 +3652,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3655 | { | 3652 | { |
3656 | byte[] bytes = new byte[60]; | 3653 | byte[] bytes = new byte[60]; |
3657 | int i = 0; | 3654 | int i = 0; |
3658 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock(); | 3655 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = PacketPool.GetDataBlock<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>(); |
3659 | 3656 | ||
3660 | dat.TextureEntry = new byte[0]; // AvatarTemplate.TextureEntry; | 3657 | dat.TextureEntry = new byte[0]; // AvatarTemplate.TextureEntry; |
3661 | 3658 | ||
@@ -3750,7 +3747,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3750 | byte[] bytes = new byte[60]; | 3747 | byte[] bytes = new byte[60]; |
3751 | 3748 | ||
3752 | int i = 0; | 3749 | int i = 0; |
3753 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock(); | 3750 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = PacketPool.GetDataBlock<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>(); |
3754 | dat.TextureEntry = new byte[0]; | 3751 | dat.TextureEntry = new byte[0]; |
3755 | bytes[i++] = (byte)(ID % 256); | 3752 | bytes[i++] = (byte)(ID % 256); |
3756 | bytes[i++] = (byte)((ID >> 8) % 256); | 3753 | bytes[i++] = (byte)((ID >> 8) % 256); |
@@ -3837,7 +3834,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3837 | /// <returns></returns> | 3834 | /// <returns></returns> |
3838 | protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimitiveBaseShape primShape, uint flags) | 3835 | protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimitiveBaseShape primShape, uint flags) |
3839 | { | 3836 | { |
3840 | ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock(); | 3837 | ObjectUpdatePacket.ObjectDataBlock objupdate = PacketPool.GetDataBlock<ObjectUpdatePacket.ObjectDataBlock>(); |
3841 | SetDefaultPrimPacketValues(objupdate); | 3838 | SetDefaultPrimPacketValues(objupdate); |
3842 | objupdate.UpdateFlags = flags; | 3839 | objupdate.UpdateFlags = flags; |
3843 | SetPrimPacketShapeData(objupdate, primShape); | 3840 | SetPrimPacketShapeData(objupdate, primShape); |
@@ -3908,7 +3905,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3908 | /// <returns></returns> | 3905 | /// <returns></returns> |
3909 | public ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry) | 3906 | public ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry) |
3910 | { | 3907 | { |
3911 | ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); | 3908 | ObjectUpdatePacket.ObjectDataBlock objdata = PacketPool.GetDataBlock<ObjectUpdatePacket.ObjectDataBlock>(); |
3912 | // new OpenMetaverse.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i); | 3909 | // new OpenMetaverse.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i); |
3913 | 3910 | ||
3914 | SetDefaultAvatarPacketValues(ref objdata); | 3911 | SetDefaultAvatarPacketValues(ref objdata); |