aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
2 files changed, 4 insertions, 7 deletions
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