aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Agent
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-10 12:01:36 +0000
committerTeravus Ovares2008-05-10 12:01:36 +0000
commit536a92ca84d510b96595a48df74c61eab6f96749 (patch)
tree2f569d91e112dec96de3f5273541e6d097fcaa9c /OpenSim/Region/Environment/Modules/Agent
parent* Experiment in Zerocoding. (diff)
downloadopensim-SC_OLD-536a92ca84d510b96595a48df74c61eab6f96749.zip
opensim-SC_OLD-536a92ca84d510b96595a48df74c61eab6f96749.tar.gz
opensim-SC_OLD-536a92ca84d510b96595a48df74c61eab6f96749.tar.bz2
opensim-SC_OLD-536a92ca84d510b96595a48df74c61eab6f96749.tar.xz
Refactored out a few warnings related to Adam's bane OutPacket
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Agent')
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs27
1 files changed, 8 insertions, 19 deletions
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
190 Array.Copy(data, 4, buffer2, 0, data.Length - 4); 190 Array.Copy(data, 4, buffer2, 0, data.Length - 4);
191 Asset.Data = buffer2; 191 Asset.Data = buffer2;
192 } 192 }
193 ConfirmXferPacketPacket newPack = new ConfirmXferPacketPacket(); 193
194 newPack.XferID.ID = xferID; 194 ourClient.SendConfirmXfer(xferID, packetID);
195 newPack.XferID.Packet = packetID; 195
196 newPack.Header.Zerocoded = true;
197 ourClient.OutPacket(newPack, ThrottleOutPacketType.Asset);
198 if ((packetID & 0x80000000) != 0) 196 if ((packetID & 0x80000000) != 0)
199 { 197 {
200 SendCompleteMessage(); 198 SendCompleteMessage();
@@ -245,25 +243,16 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
245 { 243 {
246 UploadComplete = false; 244 UploadComplete = false;
247 XferID = Util.GetNextXferID(); 245 XferID = Util.GetNextXferID();
248 RequestXferPacket newPack = new RequestXferPacket(); 246 ourClient.SendXferRequest(XferID, Asset.Type, Asset.FullID, 0, new byte[0]);
249 newPack.XferID.ID = XferID;
250 newPack.XferID.VFileType = Asset.Type;
251 newPack.XferID.VFileID = Asset.FullID;
252 newPack.XferID.FilePath = 0;
253 newPack.XferID.Filename = new byte[0];
254 newPack.Header.Zerocoded = true;
255 ourClient.OutPacket(newPack, ThrottleOutPacketType.Asset);
256 } 247 }
257 248
258 protected void SendCompleteMessage() 249 protected void SendCompleteMessage()
259 { 250 {
260 UploadComplete = true; 251 UploadComplete = true;
261 AssetUploadCompletePacket newPack = new AssetUploadCompletePacket(); 252
262 newPack.AssetBlock.Type = Asset.Type; 253 ourClient.SendAssetUploadCompleteMessage(Asset.Type, true, Asset.FullID);
263 newPack.AssetBlock.Success = true; 254
264 newPack.AssetBlock.UUID = Asset.FullID; 255
265 newPack.Header.Zerocoded = true;
266 ourClient.OutPacket(newPack, ThrottleOutPacketType.Asset);
267 m_finished = true; 256 m_finished = true;
268 if (m_createItem) 257 if (m_createItem)
269 { 258 {