From a13a4c61448380852df3fba05d2c88710c28e0a9 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 21 Jul 2008 17:13:32 +0000
Subject: * minor: change misleading 'all assets found' message to instead tell
 how many were actually located

---
 .../Environment/Modules/World/Archiver/AssetsRequest.cs    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs')

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
index ebcbcc7..2fd79b1 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
@@ -54,6 +54,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         /// Assets retrieved in this request
         /// </summary>
         protected Dictionary<LLUUID, AssetBase> m_assets = new Dictionary<LLUUID, AssetBase>();
+        
+        /// <summary>
+        /// Maintain a list of assets that could not be found.  This will be passed back to the requester.
+        /// </summary>
+        protected List<LLUUID> m_notFoundAssetUuids = new List<LLUUID>();
 
         /// <summary>
         /// Record the number of asset replies required so we know when we've finished
@@ -77,7 +82,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         {
             // We can stop here if there are no assets to fetch
             if (m_repliesRequired == 0)
-                m_assetsRequestCallback(m_assets);
+                m_assetsRequestCallback(m_assets, m_notFoundAssetUuids);
 
             foreach (LLUUID uuid in m_uuids)
             {
@@ -92,7 +97,10 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         /// <param name="asset"></param>
         public void AssetRequestCallback(LLUUID assetID, AssetBase asset)
         {
-            m_assets[assetID] = asset;
+            if (asset != null)
+                m_assets[assetID] = asset;
+            else
+                m_notFoundAssetUuids.Add(assetID);
 
             if (m_assets.Count == m_repliesRequired)
             {
@@ -108,7 +116,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         /// </summary>
         protected void PerformAssetsRequestCallback()
         {
-            m_assetsRequestCallback(m_assets);
+            m_assetsRequestCallback(m_assets, m_notFoundAssetUuids);
         }
     }
 }
-- 
cgit v1.1