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

---
 OpenSim/Framework/IClientAPI.cs                                | 10 +++++++++-
 OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs           |  3 ++-
 .../Environment/Modules/Agent/TextureSender/TextureSender.cs   |  9 +++------
 OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs      |  2 +-
 OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs         |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'OpenSim')

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
         void SendConfirmXfer(ulong xferID, uint PacketID);
         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();
         
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
             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();
             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
                 {
                     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)
         {
         }
 
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
         {
         }
 
-        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