ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactored out a few warnings related to Adam's bane OutPacket

Browse Source
This commit is contained in:
Teravus Ovares
2008-05-10 12:01:36 +00:00
parent e8478dadc8
commit 536a92ca84
4 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
View File

@@ -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)
{