From 1ad83bcf1b71722a503ebca5540cc61015aad635 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Thu, 6 Dec 2007 20:13:02 +0000
Subject: 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.

---
 OpenSim/Framework/Communications/Cache/AssetCache.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'OpenSim/Framework')

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
                     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);
-- 
cgit v1.1