mirror of
https://github.com/opensim/opensim.git
synced 2026-08-11 20:05:33 +08:00
reversing the r2599 patch, as this started causing CreateThread errors for
me on Mono 1.2.4, which led to client crashes. I think the Timer.Stop() wasn't doing what was desired on Mono. The Queue refactoring should address the readability issues lbsa71 was working on as soon as I get the merge together.
This commit is contained in:
@@ -776,13 +776,8 @@ namespace OpenSim.Framework.Communications.Cache
|
||||
im.Header.Reliable = false;
|
||||
im.ImageID.Packet = (ushort) (req.PacketCounter);
|
||||
im.ImageID.ID = req.ImageInfo.FullID;
|
||||
|
||||
int size = req.ImageInfo.Data.Length - 600 - (1000*(req.PacketCounter - 1));
|
||||
if (size > 1000)
|
||||
{
|
||||
size = 1000;
|
||||
}
|
||||
|
||||
if (size > 1000) size = 1000;
|
||||
//Console.WriteLine("length= {0} counter= {1} size= {2}",req.ImageInfo.Data.Length, req.PacketCounter, size);
|
||||
im.ImageData.Data = new byte[size];
|
||||
Array.Copy(req.ImageInfo.Data, 600 + (1000*(req.PacketCounter - 1)), im.ImageData.Data, 0, size);
|
||||
|
||||
Reference in New Issue
Block a user