From 063ba29ff8e6fa6982203d74b0c3ad75342490e8 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 15 Oct 2008 14:56:58 +0000 Subject: * refactor: rename SendImagePart to SendImageFirstPart since this is more descriptive of its actual function --- .../Environment/Modules/Agent/TextureSender/TextureSender.cs | 9 +++------ OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/Environment/Modules') diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs index dbfd4d2..2835cfa 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs @@ -156,18 +156,16 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender { if (NumPackets == 0) { - - RequestUser.SendImagePart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2); - + RequestUser.SendImageFirstPart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2); PacketCounter++; } else { - byte[] ImageData1 = new byte[600]; Array.Copy(m_asset.Data, 0, ImageData1, 0, 600); - RequestUser.SendImagePart((ushort)(NumPackets), m_asset.FullID, (uint)m_asset.Data.Length, ImageData1, 2); + RequestUser.SendImageFirstPart( + (ushort)(NumPackets), m_asset.FullID, (uint)m_asset.Data.Length, ImageData1, 2); PacketCounter++; } } @@ -193,7 +191,6 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender } RequestUser.OutPacket(im, ThrottleOutPacketType.Texture); - PacketCounter++; } } diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index 0143f2c..627785c 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs @@ -704,7 +704,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC { } - public void SendImagePart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) + public void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) { } -- cgit v1.1