From efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 27 Dec 2007 21:41:48 +0000
Subject: * Optimized usings * shortened references * Removed redundant 'this'
 * Normalized EOF

---
 .../Framework/Communications/Cache/AssetCache.cs   | 49 +++++++++++-----------
 1 file changed, 24 insertions(+), 25 deletions(-)

(limited to 'OpenSim/Framework/Communications/Cache/AssetCache.cs')

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 4765548..664625e 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -28,7 +28,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Threading;
 using libsecondlife;
 using libsecondlife.Packets;
@@ -92,7 +91,7 @@ namespace OpenSim.Framework.Communications.Cache
                     Thread.Sleep(500);
                 }
                 catch (Exception e)
-                {                    
+                {
                     m_log.Error("ASSETCACHE", e.ToString());
                 }
             }
@@ -177,30 +176,29 @@ namespace OpenSim.Framework.Communications.Cache
             // packets from the client.
             int pollPeriod = 200;
             int maxPolls = 15;
-            
+
             AssetBase asset = GetCachedAsset(assetID);
             if (asset != null)
             {
                 return asset;
             }
-            
-            m_assetServer.RequestAsset(assetID, isTexture);            
-            
+
+            m_assetServer.RequestAsset(assetID, isTexture);
+
             do
             {
                 Thread.Sleep(pollPeriod);
-                
+
                 asset = GetCachedAsset(assetID);
                 if (asset != null)
                 {
                     return asset;
                 }
-            } 
-            while (--maxPolls > 0);
-            
+            } while (--maxPolls > 0);
+
             MainLog.Instance.Warn(
                 "ASSETCACHE", "Asset {0} was not received before the retrieval timeout was reached");
-            
+
             return null;
         }
 
@@ -368,12 +366,13 @@ namespace OpenSim.Framework.Communications.Cache
             {
                 // over max number of bytes so split up file
                 long restData = data.LongLength - m_maxPacketSize;
-                int restPackets = (int) ((restData + m_maxPacketSize - 1) / m_maxPacketSize);
+                int restPackets = (int) ((restData + m_maxPacketSize - 1)/m_maxPacketSize);
                 numPackets += restPackets;
             }
 
             return numPackets;
         }
+
         #region Assets
 
         /// <summary>
@@ -448,7 +447,7 @@ namespace OpenSim.Framework.Communications.Cache
             AssetRequest req;
             for (int i = 0; i < num; i++)
             {
-                req = (AssetRequest)AssetRequests[i];
+                req = (AssetRequest) AssetRequests[i];
                 //Console.WriteLine("sending asset " + req.RequestAssetID);
                 TransferInfoPacket Transfer = new TransferInfoPacket();
                 Transfer.TransferInfo.ChannelType = 2;
@@ -458,7 +457,7 @@ namespace OpenSim.Framework.Communications.Cache
                 {
                     Transfer.TransferInfo.Params = new byte[20];
                     Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
-                    int assType = (int)req.AssetInf.Type;
+                    int assType = (int) req.AssetInf.Type;
                     Array.Copy(Helpers.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4);
                 }
                 else if (req.AssetRequestSource == 3)
@@ -468,7 +467,7 @@ namespace OpenSim.Framework.Communications.Cache
                     //Array.Copy(req.RequestUser.AgentId.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
                     //Array.Copy(req.RequestUser.SessionId.GetBytes(), 0, Transfer.TransferInfo.Params, 16, 16);
                 }
-                Transfer.TransferInfo.Size = (int)req.AssetInf.Data.Length;
+                Transfer.TransferInfo.Size = (int) req.AssetInf.Data.Length;
                 Transfer.TransferInfo.TransferID = req.TransferRequestID;
                 req.RequestUser.OutPacket(Transfer, ThrottleOutPacketType.Asset);
 
@@ -488,20 +487,20 @@ namespace OpenSim.Framework.Communications.Cache
                     // libsecondlife hardcodes 1500 as the maximum data chunk size
                     int maxChunkSize = 1500;
                     int packetNumber = 0;
-                    
+
                     while (processedLength < req.AssetInf.Data.Length)
                     {
                         TransferPacketPacket TransferPacket = new TransferPacketPacket();
                         TransferPacket.TransferData.Packet = packetNumber;
                         TransferPacket.TransferData.ChannelType = 2;
                         TransferPacket.TransferData.TransferID = req.TransferRequestID;
-                        
-                        int chunkSize = Math.Min(req.AssetInf.Data.Length - processedLength, maxChunkSize);                            
+
+                        int chunkSize = Math.Min(req.AssetInf.Data.Length - processedLength, maxChunkSize);
                         byte[] chunk = new byte[chunkSize];
-                        Array.Copy(req.AssetInf.Data, processedLength, chunk, 0, chunk.Length);  
-                        
+                        Array.Copy(req.AssetInf.Data, processedLength, chunk, 0, chunk.Length);
+
                         TransferPacket.TransferData.Data = chunk;
-                        
+
                         // 0 indicates more packets to come, 1 indicates last packet
                         if (req.AssetInf.Data.Length - processedLength > maxChunkSize)
                         {
@@ -510,10 +509,10 @@ namespace OpenSim.Framework.Communications.Cache
                         else
                         {
                             TransferPacket.TransferData.Status = 1;
-                        }                                                        
-                        
+                        }
+
                         req.RequestUser.OutPacket(TransferPacket, ThrottleOutPacketType.Asset);
-                        
+
                         processedLength += chunkSize;
                         packetNumber++;
                     }
@@ -609,4 +608,4 @@ namespace OpenSim.Framework.Communications.Cache
             }
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1