OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* refactor: rename SendImagePart to SendImageFirstPart since this is more descriptive of its actual function

0.6.0-stable
Justin Clarke Casey 2008-10-15 14:56:58 +00:00
parent 8ba8b0300a
commit 063ba29ff8
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/IClientAPI.cs
View File

@ -793,7 +793,15 @@ namespace OpenSim.Framework
void SendConfirmXfer(ulong xferID, uint PacketID); void SendConfirmXfer(ulong xferID, uint PacketID);
void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName); void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName);
void SendImagePart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec); /// <summary>
/// Send the first part of a texture. For sufficiently small textures, this may be the only packet.
/// </summary>
/// <param name="numParts"></param>
/// <param name="ImageUUID"></param>
/// <param name="ImageSize"></param>
/// <param name="ImageData"></param>
/// <param name="imageCodec"></param>
void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec);
void SendShutdownConnectionNotice(); void SendShutdownConnectionNotice();

3
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -2603,7 +2603,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(newPack, ThrottleOutPacketType.Asset); OutPacket(newPack, ThrottleOutPacketType.Asset);
} }
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)
{ {
ImageDataPacket im = new ImageDataPacket(); ImageDataPacket im = new ImageDataPacket();
im.Header.Reliable = false; im.Header.Reliable = false;

9
OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
View File

@ -156,18 +156,16 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
{ {
if (NumPackets == 0) if (NumPackets == 0)
{ {
RequestUser.SendImageFirstPart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2);
RequestUser.SendImagePart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2);
PacketCounter++; PacketCounter++;
} }
else else
{ {
byte[] ImageData1 = new byte[600]; byte[] ImageData1 = new byte[600];
Array.Copy(m_asset.Data, 0, ImageData1, 0, 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++; PacketCounter++;
} }
} }
@ -193,7 +191,6 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
} }
RequestUser.OutPacket(im, ThrottleOutPacketType.Texture); RequestUser.OutPacket(im, ThrottleOutPacketType.Texture);
PacketCounter++; PacketCounter++;
} }
} }

2
OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
View File

@ -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)
{ {
} }

2
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -622,7 +622,7 @@ namespace OpenSim.Region.Examples.SimpleModule
{ {
} }
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)
{ {
} }