From be20f41637b6c06ce3ab16bc25851b6e43468e12 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 30 Apr 2008 21:43:47 +0000
Subject: * Cruft removal step #1. Cleaning Modules directory.

---
 .../Agent/AssetDownload/AssetDownloadModule.cs     | 37 ++++++++++++++--------
 1 file changed, 23 insertions(+), 14 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs')

diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs
index 47c1479..33e917a 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs
@@ -37,17 +37,18 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
 {
     public class AssetDownloadModule : IRegionModule
     {
+        /// <summary>
+        /// Asset requests with data which are ready to be sent back to requesters.  This includes textures.
+        /// </summary>
+        private List<AssetRequest> AssetRequests;
+
         private Scene m_scene;
         private Dictionary<LLUUID, Scene> RegisteredScenes = new Dictionary<LLUUID, Scene>();
+
         ///
         /// Assets requests (for each user) which are waiting for asset server data.  This includes texture requests
         /// </summary>
-        private Dictionary<LLUUID, Dictionary<LLUUID,AssetRequest>> RequestedAssets;
-
-        /// <summary>
-        /// Asset requests with data which are ready to be sent back to requesters.  This includes textures.
-        /// </summary>
-        private List<AssetRequest> AssetRequests;
+        private Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>> RequestedAssets;
 
         public AssetDownloadModule()
         {
@@ -55,6 +56,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
             AssetRequests = new List<AssetRequest>();
         }
 
+        #region IRegionModule Members
+
         public void Initialise(Scene scene, IConfigSource config)
         {
             if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
@@ -92,6 +95,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
             get { return true; }
         }
 
+        #endregion
+
         public void NewClient(IClientAPI client)
         {
             // client.OnRequestAsset += AddAssetRequest;
@@ -301,33 +306,37 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
             {
                 // 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 Nested type: AssetRequest
+
         public class AssetRequest
         {
-            public IClientAPI RequestUser;
-            public LLUUID RequestAssetID;
             public AssetBase AssetInf;
-            public AssetBase ImageInfo;
-            public LLUUID TransferRequestID;
+            public byte AssetRequestSource = 2;
             public long DataPointer = 0;
+            public int DiscardLevel = -1;
+            public AssetBase ImageInfo;
+            public bool IsTextureRequest;
             public int NumPackets = 0;
             public int PacketCounter = 0;
-            public bool IsTextureRequest;
-            public byte AssetRequestSource = 2;
             public byte[] Params = null;
+            public LLUUID RequestAssetID;
+            public IClientAPI RequestUser;
+            public LLUUID TransferRequestID;
             //public bool AssetInCache;
             //public int TimeRequested; 
-            public int DiscardLevel = -1;
 
             public AssetRequest()
             {
             }
         }
+
+        #endregion
     }
 }
\ No newline at end of file
-- 
cgit v1.1