From 536a92ca84d510b96595a48df74c61eab6f96749 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 10 May 2008 12:01:36 +0000
Subject: Refactored out a few warnings related to Adam's bane OutPacket

---
 OpenSim/Framework/IClientAPI.cs                    |  4 ++++
 .../Region/ClientStack/LindenUDP/LLClientView.cs   | 28 ++++++++++++++++++++++
 .../AssetTransaction/AgentAssetsTransactions.cs    | 27 +++++++--------------
 .../Region/Examples/SimpleModule/MyNpcCharacter.cs |  9 +++++++
 4 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 277eb88..9927808 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -933,6 +933,10 @@ namespace OpenSim.Framework
         void sendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount);
         void sendLandParcelOverlay(byte[] data, int sequence_id);
 
+        void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID);
+        void SendConfirmXfer(ulong xferID, uint PacketID);
+        void SendXferRequest(ulong XferID, short AssetType, LLUUID vFileID, byte FilePath, byte[] FileName);
+
         byte[] GetThrottlesPacked(float multiplier);
 
 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 2dac62d..053b077 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2200,7 +2200,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             terse.Header.Zerocoded = true;
             OutPacket(terse, ThrottleOutPacketType.Task);
         }
+        public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID)
+        {
+            AssetUploadCompletePacket newPack = new AssetUploadCompletePacket();
+            newPack.AssetBlock.Type = AssetType;
+            newPack.AssetBlock.Success = Success;
+            newPack.AssetBlock.UUID = AssetFullID;
+            newPack.Header.Zerocoded = true;
+            OutPacket(newPack, ThrottleOutPacketType.Asset);
+        }
+        public void SendXferRequest(ulong XferID, short AssetType, LLUUID vFileID, byte FilePath, byte[] FileName)
+        {
+            RequestXferPacket newPack = new RequestXferPacket();
+            newPack.XferID.ID = XferID;
+            newPack.XferID.VFileType = AssetType;
+            newPack.XferID.VFileID = vFileID;
+            newPack.XferID.FilePath = FilePath;
+            newPack.XferID.Filename = FileName;
+            newPack.Header.Zerocoded = true;
+            OutPacket(newPack, ThrottleOutPacketType.Asset);
 
+        }
+        public void SendConfirmXfer(ulong xferID, uint PacketID)
+        {
+            ConfirmXferPacketPacket newPack = new ConfirmXferPacketPacket();
+            newPack.XferID.ID = xferID;
+            newPack.XferID.Packet = PacketID;
+            newPack.Header.Zerocoded = true;
+            OutPacket(newPack, ThrottleOutPacketType.Asset);
+        }
         #endregion
 
         #region Estate Data Sending Methods
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 6270893..bae23fa 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -190,11 +190,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
                         Array.Copy(data, 4, buffer2, 0, data.Length - 4);
                         Asset.Data = buffer2;
                     }
-                    ConfirmXferPacketPacket newPack = new ConfirmXferPacketPacket();
-                    newPack.XferID.ID = xferID;
-                    newPack.XferID.Packet = packetID;
-                    newPack.Header.Zerocoded = true;
-                    ourClient.OutPacket(newPack, ThrottleOutPacketType.Asset);
+
+                    ourClient.SendConfirmXfer(xferID, packetID);
+                    
                     if ((packetID & 0x80000000) != 0)
                     {
                         SendCompleteMessage();
@@ -245,25 +243,16 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
             {
                 UploadComplete = false;
                 XferID = Util.GetNextXferID();
-                RequestXferPacket newPack = new RequestXferPacket();
-                newPack.XferID.ID = XferID;
-                newPack.XferID.VFileType = Asset.Type;
-                newPack.XferID.VFileID = Asset.FullID;
-                newPack.XferID.FilePath = 0;
-                newPack.XferID.Filename = new byte[0];
-                newPack.Header.Zerocoded = true;
-                ourClient.OutPacket(newPack, ThrottleOutPacketType.Asset);
+                ourClient.SendXferRequest(XferID, Asset.Type, Asset.FullID, 0, new byte[0]);
             }
 
             protected void SendCompleteMessage()
             {
                 UploadComplete = true;
-                AssetUploadCompletePacket newPack = new AssetUploadCompletePacket();
-                newPack.AssetBlock.Type = Asset.Type;
-                newPack.AssetBlock.Success = true;
-                newPack.AssetBlock.UUID = Asset.FullID;
-                newPack.Header.Zerocoded = true;
-                ourClient.OutPacket(newPack, ThrottleOutPacketType.Asset);
+
+                ourClient.SendAssetUploadCompleteMessage(Asset.Type, true, Asset.FullID);
+
+
                 m_finished = true;
                 if (m_createItem)
                 {
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index e5e6469..bc87e53 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -519,6 +519,15 @@ namespace OpenSim.Region.Examples.SimpleModule
                 OnCompleteMovementToRegion();
             }
         }
+        public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID)
+        {
+        }
+        public void SendConfirmXfer(ulong xferID, uint PacketID)
+        {
+        }
+        public void SendXferRequest(ulong XferID, short AssetType, LLUUID vFileID, byte FilePath, byte[] FileName)
+        {
+        }
 
         private void Update()
         {
-- 
cgit v1.1