diff options
author | lbsa71 | 2007-12-06 14:08:22 +0000 |
---|---|---|
committer | lbsa71 | 2007-12-06 14:08:22 +0000 |
commit | 395637acddca473380d09ba23acc3b6db0814e75 (patch) | |
tree | dcf1889423fc957ba0eedea918a15514eb543562 /OpenSim/Framework/Communications | |
parent | Fixed conversation bug in InventoryConfig (diff) | |
download | opensim-SC-395637acddca473380d09ba23acc3b6db0814e75.zip opensim-SC-395637acddca473380d09ba23acc3b6db0814e75.tar.gz opensim-SC-395637acddca473380d09ba23acc3b6db0814e75.tar.bz2 opensim-SC-395637acddca473380d09ba23acc3b6db0814e75.tar.xz |
* now the throttle timer is stopped whilst processing Queue so that it won't fire twice
* started to refactored throttling method
* some code convention refactorings
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index cb8b9f6..64e0e54 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -776,8 +776,13 @@ 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 | |||
779 | int size = req.ImageInfo.Data.Length - 600 - (1000*(req.PacketCounter - 1)); | 780 | int size = req.ImageInfo.Data.Length - 600 - (1000*(req.PacketCounter - 1)); |
780 | if (size > 1000) size = 1000; | 781 | if (size > 1000) |
782 | { | ||
783 | size = 1000; | ||
784 | } | ||
785 | |||
781 | //Console.WriteLine("length= {0} counter= {1} size= {2}",req.ImageInfo.Data.Length, req.PacketCounter, size); | 786 | //Console.WriteLine("length= {0} counter= {1} size= {2}",req.ImageInfo.Data.Length, req.PacketCounter, size); |
782 | im.ImageData.Data = new byte[size]; | 787 | im.ImageData.Data = new byte[size]; |
783 | Array.Copy(req.ImageInfo.Data, 600 + (1000*(req.PacketCounter - 1)), im.ImageData.Data, 0, size); | 788 | Array.Copy(req.ImageInfo.Data, 600 + (1000*(req.PacketCounter - 1)), im.ImageData.Data, 0, size); |