Fix bug where the uuid gatherer was not inspecting UUIDs for items in an embedded object's inventory.

Added regression test for this case.
Likely a regression since 08606ae4 (Thu Jan 8 2015)
Relates to Mantises 7439, 7450 and possibly others.

1 files changed, 12 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 69dc133..9ec4e1d 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -123,6 +123,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_assetUuidsToInspect.Contains(uuid))
                 return false;
 
+//            m_log.DebugFormat("[UUID GATHERER]: Adding asset {0} for inspection", uuid);
+
             m_assetUuidsToInspect.Enqueue(uuid);
 
             return true;
@@ -238,7 +240,11 @@ namespace OpenSim.Region.Framework.Scenes
             if (Complete)
                 return false;
 
-            GetAssetUuids(m_assetUuidsToInspect.Dequeue());
+            UUID nextToInspect = m_assetUuidsToInspect.Dequeue();
+
+//            m_log.DebugFormat("[UUID GATHERER]: Inspecting asset {0}", nextToInspect);
+
+            GetAssetUuids(nextToInspect);
 
             return true;
         }
@@ -322,8 +328,6 @@ namespace OpenSim.Region.Framework.Scenes
             // Here, we want to collect uuids which require further asset fetches but mark the others as gathered
             try
             {               
-                GatheredUuids[assetUuid] = assetType;
-
                 if ((sbyte)AssetType.Bodypart == assetType 
                     || (sbyte)AssetType.Clothing == assetType
                     || (sbyte)AssetType.Gesture == assetType
@@ -334,11 +338,15 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     AddForInspection(assetUuid);
                 }
+                else
+                {
+                    GatheredUuids[assetUuid] = assetType;
+                }
             }
             catch (Exception)
             {
                 m_log.ErrorFormat(
-                    "[ITERATABLE UUID GATHERER]: Failed to gather uuids for asset id {0}, type {1}", 
+                    "[UUID GATHERER]: Failed to gather uuids for asset id {0}, type {1}", 
                     assetUuid, assetType);
                 throw;
             }