aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/IClientAPI.cs10
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
5 files changed, 16 insertions, 10 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index bacdc62..d370aed 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -793,7 +793,15 @@ namespace OpenSim.Framework
793 void SendConfirmXfer(ulong xferID, uint PacketID); 793 void SendConfirmXfer(ulong xferID, uint PacketID);
794 void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName); 794 void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName);
795 795
796 void SendImagePart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec); 796 /// <summary>
797 /// Send the first part of a texture. For sufficiently small textures, this may be the only packet.
798 /// </summary>
799 /// <param name="numParts"></param>
800 /// <param name="ImageUUID"></param>
801 /// <param name="ImageSize"></param>
802 /// <param name="ImageData"></param>
803 /// <param name="imageCodec"></param>
804 void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec);
797 805
798 void SendShutdownConnectionNotice(); 806 void SendShutdownConnectionNotice();
799 807
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 6a011b4..4c68fae 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2603,7 +2603,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2603 OutPacket(newPack, ThrottleOutPacketType.Asset); 2603 OutPacket(newPack, ThrottleOutPacketType.Asset);
2604 } 2604 }
2605 2605
2606 public void SendImagePart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) 2606 public void SendImageFirstPart(
2607 ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
2607 { 2608 {
2608 ImageDataPacket im = new ImageDataPacket(); 2609 ImageDataPacket im = new ImageDataPacket();
2609 im.Header.Reliable = false; 2610 im.Header.Reliable = false;
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
156 { 156 {
157 if (NumPackets == 0) 157 if (NumPackets == 0)
158 { 158 {
159 159 RequestUser.SendImageFirstPart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2);
160 RequestUser.SendImagePart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2);
161
162 PacketCounter++; 160 PacketCounter++;
163 } 161 }
164 else 162 else
165 { 163 {
166
167 byte[] ImageData1 = new byte[600]; 164 byte[] ImageData1 = new byte[600];
168 Array.Copy(m_asset.Data, 0, ImageData1, 0, 600); 165 Array.Copy(m_asset.Data, 0, ImageData1, 0, 600);
169 166
170 RequestUser.SendImagePart((ushort)(NumPackets), m_asset.FullID, (uint)m_asset.Data.Length, ImageData1, 2); 167 RequestUser.SendImageFirstPart(
168 (ushort)(NumPackets), m_asset.FullID, (uint)m_asset.Data.Length, ImageData1, 2);
171 PacketCounter++; 169 PacketCounter++;
172 } 170 }
173 } 171 }
@@ -193,7 +191,6 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
193 } 191 }
194 RequestUser.OutPacket(im, ThrottleOutPacketType.Texture); 192 RequestUser.OutPacket(im, ThrottleOutPacketType.Texture);
195 193
196
197 PacketCounter++; 194 PacketCounter++;
198 } 195 }
199 } 196 }
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
704 { 704 {
705 } 705 }
706 706
707 public void SendImagePart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) 707 public void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
708 { 708 {
709 } 709 }
710 710
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 0be726d..2ce63a5 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -622,7 +622,7 @@ namespace OpenSim.Region.Examples.SimpleModule
622 { 622 {
623 } 623 }
624 624
625 public void SendImagePart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) 625 public void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
626 { 626 {
627 } 627 }
628 628