From 3782d6aab74278996360e6b3e0762a7f6f105495 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sun, 21 Sep 2008 20:44:54 +0000
Subject: * minor: Remove some of the redundant asset id storage for now

---
 .../Framework/Communications/Cache/AssetCache.cs   | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Framework/Communications/Cache')

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 9c73587..32a6c7d 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -253,7 +253,7 @@ namespace OpenSim.Framework.Communications.Cache
             {
                 // m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId);
                 
-                NewAssetRequest req = new NewAssetRequest(assetId, callback);
+                NewAssetRequest req = new NewAssetRequest(callback);
                 AssetRequestsList requestList;
 
                 lock (RequestLists)
@@ -267,7 +267,7 @@ namespace OpenSim.Framework.Communications.Cache
                     else
                     {
                         // m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId);
-                        requestList = new AssetRequestsList(assetId);
+                        requestList = new AssetRequestsList();
                         requestList.TimeRequested = DateTime.Now;
                         requestList.Requests.Add(req);           
                         
@@ -675,30 +675,31 @@ namespace OpenSim.Framework.Communications.Cache
             }
         }
 
+        /// <summary>
+        /// A list of requests for a particular asset.
+        /// </summary>
         public class AssetRequestsList
         {
-            public UUID AssetID;
+            /// <summary>
+            /// A list of requests for assets
+            /// </summary>
             public List<NewAssetRequest> Requests = new List<NewAssetRequest>();
             
             /// <summary>
             /// Record the time that this request was first made.
             /// </summary>
             public DateTime TimeRequested;
-
-            public AssetRequestsList(UUID assetID)
-            {
-                AssetID = assetID;
-            }
         }
 
+        /// <summary>
+        /// Represent a request for an asset that has yet to be fulfilled.
+        /// </summary>
         public class NewAssetRequest
         {
-            public UUID AssetID;
             public AssetRequestCallback Callback;
 
-            public NewAssetRequest(UUID assetID, AssetRequestCallback callback)
+            public NewAssetRequest(AssetRequestCallback callback)
             {
-                AssetID = assetID;
                 Callback = callback;
             }
         }
-- 
cgit v1.1