Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using patch from http://jira.openmetaverse.org/browse/LIBOMV-942

Browse Source
This commit is contained in:
Douglas R. Miles
2012-06-02 15:01:27 -07:00
parent b1ae7397a8
commit ffb9a5cdc5
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenMetaverse/AssetManager.cs
View File

@@ -197,11 +197,16 @@ namespace OpenMetaverse
public float Priority;
public Simulator Simulator;
public AssetManager.AssetReceivedCallback Callback;
public int nextPacket;
public InternalDictionary<int, byte[]> outOfOrderPackets;
internal ManualResetEvent HeaderReceivedEvent = new ManualResetEvent(false);
public AssetDownload()
: base()
{
nextPacket = 0;
outOfOrderPackets = new InternalDictionary<int, byte[]>();
}
}
@@ -1433,11 +1438,10 @@ namespace OpenMetaverse
{
TransferPacketPacket asset = (TransferPacketPacket)e.Packet;
Transfer transfer;
AssetDownload download;
if (Transfers.TryGetValue(asset.TransferData.TransferID, out transfer))
{
download = (AssetDownload)transfer;
AssetDownload download = (AssetDownload)transfer;
if (download.Size == 0)
{
@@ -1471,13 +1475,25 @@ namespace OpenMetaverse
}
}
// This assumes that every transfer packet except the last one is exactly 1000 bytes,
// hopefully that is a safe assumption to make
// If packets arrive out of order, we add them to the out of order packet directory
// until all previous packets have arrived
try
{
Buffer.BlockCopy(asset.TransferData.Data, 0, download.AssetData, 1000 * asset.TransferData.Packet,
asset.TransferData.Data.Length);
download.Transferred += asset.TransferData.Data.Length;
if (download.nextPacket == asset.TransferData.Packet)
{
byte[] data = asset.TransferData.Data;
do
{
Buffer.BlockCopy(data, 0, download.AssetData, download.Transferred, data.Length);
download.Transferred += data.Length;
download.nextPacket++;
} while (download.outOfOrderPackets.TryGetValue(download.nextPacket, out data));
}
else
{
//Logger.Log(string.Format("Fixing out of order packet {0} when expecting {1}!", asset.TransferData.Packet, download.nextPacket), Helpers.LogLevel.Debug);
download.outOfOrderPackets.Add(asset.TransferData.Packet, asset.TransferData.Data);
}
}
catch (ArgumentException)
{