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

* Refactored NumPackets calculation

afrisby
lbsa71 2007-11-23 13:21:39 +00:00
parent 1ecd803e87
commit fb2588b409
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -333,15 +333,9 @@ namespace OpenSim.Framework.Communications.Cache
{ {
AssetRequest req = RequestedTextures[image.FullID]; AssetRequest req = RequestedTextures[image.FullID];
req.ImageInfo = image; req.ImageInfo = image;
if (image.Data.LongLength > 600)
{ req.NumPackets = CalculateNumPackets(image.Data.Length);
//over 600 bytes so split up file
req.NumPackets = 2 + (int) (image.Data.Length - 601)/1000;
}
else
{
req.NumPackets = 1;
}
RequestedTextures.Remove(image.FullID); RequestedTextures.Remove(image.FullID);
TextureRequests.Add(req); TextureRequests.Add(req);
} }
@ -625,24 +619,31 @@ namespace OpenSim.Framework.Communications.Cache
req.ImageInfo = imag; req.ImageInfo = imag;
req.DiscardLevel = discard; req.DiscardLevel = discard;
if (imag.Data.LongLength > 600) req.NumPackets = CalculateNumPackets(imag.Data.Length);
{
//Console.WriteLine("{0}", imag.Data.LongLength);
//over 600 bytes so split up file
req.NumPackets = 2 + (int) (imag.Data.Length - 601)/1000;
//Console.WriteLine("texture is " + imag.Data.Length + " which we will send in " +req.NumPackets +" packets");
}
else
{
req.NumPackets = 1;
}
if (packetNumber != 0) if (packetNumber != 0)
{ {
req.PacketCounter = (int) packetNumber; req.PacketCounter = (int) packetNumber;
} }
TextureRequests.Add(req); TextureRequests.Add(req);
} }
private int CalculateNumPackets(int length)
{
int numPackets = 1;
if (length > 600)
{
//over 600 bytes so split up file
int restData = (length - 600);
int restPackets = ((restData+999)/1000);
numPackets = 1 + restPackets;
}
return numPackets;
}
#endregion #endregion
public class AssetRequest public class AssetRequest