aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorSean Dague2007-12-06 20:13:02 +0000
committerSean Dague2007-12-06 20:13:02 +0000
commit1ad83bcf1b71722a503ebca5540cc61015aad635 (patch)
tree9a6c4217dd7b9a50bc6d2b8ba20fdb7910d5d1be /OpenSim/Framework/Communications
parentremoved obsolete Verbose() function (diff)
downloadopensim-SC_OLD-1ad83bcf1b71722a503ebca5540cc61015aad635.zip
opensim-SC_OLD-1ad83bcf1b71722a503ebca5540cc61015aad635.tar.gz
opensim-SC_OLD-1ad83bcf1b71722a503ebca5540cc61015aad635.tar.bz2
opensim-SC_OLD-1ad83bcf1b71722a503ebca5540cc61015aad635.tar.xz
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.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 64e0e54..cb8b9f6 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -776,13 +776,8 @@ namespace OpenSim.Framework.Communications.Cache
776 im.Header.Reliable = false; 776 im.Header.Reliable = false;
777 im.ImageID.Packet = (ushort) (req.PacketCounter); 777 im.ImageID.Packet = (ushort) (req.PacketCounter);
778 im.ImageID.ID = req.ImageInfo.FullID; 778 im.ImageID.ID = req.ImageInfo.FullID;
779
780 int size = req.ImageInfo.Data.Length - 600 - (1000*(req.PacketCounter - 1)); 779 int size = req.ImageInfo.Data.Length - 600 - (1000*(req.PacketCounter - 1));
781 if (size > 1000) 780 if (size > 1000) size = 1000;
782 {
783 size = 1000;
784 }
785
786 //Console.WriteLine("length= {0} counter= {1} size= {2}",req.ImageInfo.Data.Length, req.PacketCounter, size); 781 //Console.WriteLine("length= {0} counter= {1} size= {2}",req.ImageInfo.Data.Length, req.PacketCounter, size);
787 im.ImageData.Data = new byte[size]; 782 im.ImageData.Data = new byte[size];
788 Array.Copy(req.ImageInfo.Data, 600 + (1000*(req.PacketCounter - 1)), im.ImageData.Data, 0, size); 783 Array.Copy(req.ImageInfo.Data, 600 + (1000*(req.PacketCounter - 1)), im.ImageData.Data, 0, size);