OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

0.6.0-stable
Teravus Ovares 2008-05-10 12:01:36 +00:00
parent e8478dadc8
commit 536a92ca84
4 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/IClientAPI.cs
View File

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

28
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

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

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

9
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

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