Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 400 insertions, 204 deletions

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index e238d01..9ec4e1d 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -34,9 +34,11 @@ using System.Threading;
 using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Assets;
+using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Services.Interfaces;
+using OpenSimAssetType = OpenSim.Framework.SLUtil.OpenSimAssetType;
 
 namespace OpenSim.Region.Framework.Scenes
 {
@@ -53,75 +55,81 @@ namespace OpenSim.Region.Framework.Scenes
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <summary>
+        /// Is gathering complete?
+        /// </summary>
+        public bool Complete { get { return m_assetUuidsToInspect.Count <= 0; } }
+
+        /// <summary>
+        /// The dictionary of UUIDs gathered so far.  If Complete == true then this is all the reachable UUIDs.
+        /// </summary>
+        /// <value>The gathered uuids.</value>
+        public IDictionary<UUID, sbyte> GatheredUuids { get; private set; }
+
+        /// <summary>
+        /// Gets the next UUID to inspect.
+        /// </summary>
+        /// <value>If there is no next UUID then returns null</value>
+        public UUID? NextUuidToInspect
+        {
+            get
+            {
+                if (Complete)
+                    return null;
+                else
+                    return m_assetUuidsToInspect.Peek();
+            }
+        }
+
         protected IAssetService m_assetService;
 
-//        /// <summary>
-//        /// Used as a temporary store of an asset which represents an object.  This can be a null if no appropriate
-//        /// asset was found by the asset service.
-//        /// </summary>
-//        private AssetBase m_requestedObjectAsset;
-//
-//        /// <summary>
-//        /// Signal whether we are currently waiting for the asset service to deliver an asset.
-//        /// </summary>
-//        private bool m_waitingForObjectAsset;
-                
-        public UuidGatherer(IAssetService assetService)
+        protected Queue<UUID> m_assetUuidsToInspect;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenSim.Region.Framework.Scenes.UuidGatherer"/> class.
+        /// </summary>
+        /// <remarks>In this case the collection of gathered assets will start out blank.</remarks>
+        /// <param name="assetService">
+        /// Asset service.
+        /// </param>
+        public UuidGatherer(IAssetService assetService) : this(assetService, new Dictionary<UUID, sbyte>()) {}       
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenSim.Region.Framework.Scenes.UuidGatherer"/> class.
+        /// </summary>
+        /// <param name="assetService">
+        /// Asset service.
+        /// </param>
+        /// <param name="collector">
+        /// Gathered UUIDs will be collected in this dictinaory.  
+        /// It can be pre-populated if you want to stop the gatherer from analyzing assets that have already been fetched and inspected.
+        /// </param>
+        public UuidGatherer(IAssetService assetService, IDictionary<UUID, sbyte> collector)
         {
             m_assetService = assetService;
+            GatheredUuids = collector;
+
+            // FIXME: Not efficient for searching, can improve.
+            m_assetUuidsToInspect = new Queue<UUID>();
         }
-                
+
         /// <summary>
-        /// Gather all the asset uuids associated with the asset referenced by a given uuid
+        /// Adds the asset uuid for inspection during the gathering process.
         /// </summary>
-        /// <remarks>
-        /// This includes both those directly associated with
-        /// it (e.g. face textures) and recursively, those of items within it's inventory (e.g. objects contained
-        /// within this object).
-        /// </remarks>
-        /// <param name="assetUuid">The uuid of the asset for which to gather referenced assets</param>
-        /// <param name="assetType">The type of the asset for the uuid given</param>
-        /// <param name="assetUuids">The assets gathered</param>
-        public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids)
+        /// <returns><c>true</c>, if for inspection was added, <c>false</c> otherwise.</returns>
+        /// <param name="uuid">UUID.</param>
+        public bool AddForInspection(UUID uuid)
         {
-            // avoid infinite loops
-            if (assetUuids.ContainsKey(assetUuid))
-                return;
+            if (m_assetUuidsToInspect.Contains(uuid))
+                return false;
 
-            try
-            {               
-                assetUuids[assetUuid] = assetType;
-    
-                if (AssetType.Bodypart == assetType || AssetType.Clothing == assetType)
-                {
-                    GetWearableAssetUuids(assetUuid, assetUuids);
-                }
-                else if (AssetType.Gesture == assetType)
-                {
-                    GetGestureAssetUuids(assetUuid, assetUuids);
-                }
-                else if (AssetType.Notecard == assetType)
-                {
-                    GetTextEmbeddedAssetUuids(assetUuid, assetUuids);
-                }
-                else if (AssetType.LSLText == assetType)
-                {
-                    GetTextEmbeddedAssetUuids(assetUuid, assetUuids);
-                }
-                else if (AssetType.Object == assetType)
-                {
-                    GetSceneObjectAssetUuids(assetUuid, assetUuids);
-                }
-            }
-            catch (Exception)
-            {
-                m_log.ErrorFormat(
-                    "[UUID GATHERER]: Failed to gather uuids for asset id {0}, type {1}", 
-                    assetUuid, assetType);
-                throw;
-            }
-        }
+//            m_log.DebugFormat("[UUID GATHERER]: Adding asset {0} for inspection", uuid);
+
+            m_assetUuidsToInspect.Enqueue(uuid);
 
+            return true;
+        }
+        
         /// <summary>
         /// Gather all the asset uuids associated with a given object.
         /// </summary>
@@ -131,19 +139,18 @@ namespace OpenSim.Region.Framework.Scenes
         /// within this object).
         /// </remarks>
         /// <param name="sceneObject">The scene object for which to gather assets</param>
-        /// <param name="assetUuids">The assets gathered</param>
-        public void GatherAssetUuids(SceneObjectGroup sceneObject, IDictionary<UUID, AssetType> assetUuids)
+        public void AddForInspection(SceneObjectGroup sceneObject)
         {
-//            m_log.DebugFormat(
-//                "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
+            //            m_log.DebugFormat(
+            //                "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
 
             SceneObjectPart[] parts = sceneObject.Parts;
             for (int i = 0; i < parts.Length; i++)
             {
                 SceneObjectPart part = parts[i];
 
-//                m_log.DebugFormat(
-//                    "[ARCHIVER]: Getting part {0}, {1} for object {2}", part.Name, part.UUID, sceneObject.UUID);
+                //                m_log.DebugFormat(
+                //                    "[ARCHIVER]: Getting part {0}, {1} for object {2}", part.Name, part.UUID, sceneObject.UUID);
 
                 try
                 {
@@ -152,7 +159,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         // Get the prim's default texture.  This will be used for faces which don't have their own texture
                         if (textureEntry.DefaultTexture != null)
-                            assetUuids[textureEntry.DefaultTexture.TextureID] = AssetType.Texture;
+                            RecordTextureEntryAssetUuids(textureEntry.DefaultTexture);
 
                         if (textureEntry.FaceTextures != null)
                         {
@@ -160,27 +167,59 @@ namespace OpenSim.Region.Framework.Scenes
                             foreach (Primitive.TextureEntryFace texture in textureEntry.FaceTextures)
                             {
                                 if (texture != null)
-                                    assetUuids[texture.TextureID] = AssetType.Texture;
+                                    RecordTextureEntryAssetUuids(texture);
                             }
                         }
                     }
-                    
+
                     // If the prim is a sculpt then preserve this information too
                     if (part.Shape.SculptTexture != UUID.Zero)
-                        assetUuids[part.Shape.SculptTexture] = AssetType.Texture;
-                    
+                        GatheredUuids[part.Shape.SculptTexture] = (sbyte)AssetType.Texture;
+
+                    if (part.Shape.ProjectionTextureUUID != UUID.Zero)
+                        GatheredUuids[part.Shape.ProjectionTextureUUID] = (sbyte)AssetType.Texture;
+
+                    if (part.CollisionSound != UUID.Zero)
+                        GatheredUuids[part.CollisionSound] = (sbyte)AssetType.Sound;
+
+                    if (part.ParticleSystem.Length > 0)
+                    {
+                        try
+                        {
+                            Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0);
+                            if (ps.Texture != UUID.Zero)
+                                GatheredUuids[ps.Texture] = (sbyte)AssetType.Texture;
+                        }
+                        catch (Exception)
+                        {
+                            m_log.WarnFormat(
+                                "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt.  Continuing.", 
+                                part.Name, part.UUID, sceneObject.Name, sceneObject.UUID);
+                        }
+                    }
+
                     TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
-                    
+
                     // Now analyze this prim's inventory items to preserve all the uuids that they reference
                     foreach (TaskInventoryItem tii in taskDictionary.Values)
                     {
-//                        m_log.DebugFormat(
-//                            "[ARCHIVER]: Analysing item {0} asset type {1} in {2} {3}", 
-//                            tii.Name, tii.Type, part.Name, part.UUID);
+                        //                        m_log.DebugFormat(
+                        //                            "[ARCHIVER]: Analysing item {0} asset type {1} in {2} {3}", 
+                        //                            tii.Name, tii.Type, part.Name, part.UUID);
 
-                        if (!assetUuids.ContainsKey(tii.AssetID))
-                            GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids);
+                        if (!GatheredUuids.ContainsKey(tii.AssetID))
+                            AddForInspection(tii.AssetID, (sbyte)tii.Type);
                     }
+
+                    // FIXME: We need to make gathering modular but we cannot yet, since gatherers are not guaranteed
+                    // to be called with scene objects that are in a scene (e.g. in the case of hg asset mapping and
+                    // inventory transfer.  There needs to be a way for a module to register a method without assuming a 
+                    // Scene.EventManager is present.
+                    //                    part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
+
+
+                    // still needed to retrieve textures used as materials for any parts containing legacy materials stored in DynAttrs
+                    RecordMaterialsUuids(part); 
                 }
                 catch (Exception e)
                 {
@@ -191,179 +230,334 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
-        
-//        /// <summary>
-//        /// The callback made when we request the asset for an object from the asset service.
-//        /// </summary>
-//        private void AssetReceived(string id, Object sender, AssetBase asset)
-//        {
-//            lock (this)
-//            {
-//                m_requestedObjectAsset = asset;
-//                m_waitingForObjectAsset = false;
-//                Monitor.Pulse(this);
-//            }
-//        }
 
         /// <summary>
-        /// Get an asset synchronously, potentially using an asynchronous callback.  If the
-        /// asynchronous callback is used, we will wait for it to complete.
+        /// Gathers the next set of assets returned by the next uuid to get from the asset service.
         /// </summary>
-        /// <param name="uuid"></param>
-        /// <returns></returns>
-        protected virtual AssetBase GetAsset(UUID uuid)
+        /// <returns>false if gathering is already complete, true otherwise</returns>
+        public bool GatherNext()
         {
-            return m_assetService.Get(uuid.ToString());
+            if (Complete)
+                return false;
+
+            UUID nextToInspect = m_assetUuidsToInspect.Dequeue();
+
+//            m_log.DebugFormat("[UUID GATHERER]: Inspecting asset {0}", nextToInspect);
+
+            GetAssetUuids(nextToInspect);
 
-            // XXX: Switching to do this synchronously where the call was async before but we always waited for it
-            // to complete anyway!
-//            m_waitingForObjectAsset = true;
-//            m_assetCache.Get(uuid.ToString(), this, AssetReceived);
-//
-//            // The asset cache callback can either
-//            //
-//            // 1. Complete on the same thread (if the asset is already in the cache) or
-//            // 2. Come in via a different thread (if we need to go fetch it).
-//            //
-//            // The code below handles both these alternatives.
-//            lock (this)
-//            {
-//                if (m_waitingForObjectAsset)
-//                {
-//                    Monitor.Wait(this);
-//                    m_waitingForObjectAsset = false;
-//                }
-//            }
-//
-//            return m_requestedObjectAsset;
+            return true;
         }
 
         /// <summary>
-        /// Record the asset uuids embedded within the given script.
+        /// Gathers all remaining asset UUIDS no matter how many calls are required to the asset service.
         /// </summary>
-        /// <param name="scriptUuid"></param>
-        /// <param name="assetUuids">Dictionary in which to record the references</param>
-        private void GetTextEmbeddedAssetUuids(UUID embeddingAssetId, IDictionary<UUID, AssetType> assetUuids)
+        /// <returns>false if gathering is already complete, true otherwise</returns>
+        public bool GatherAll()
         {
-//            m_log.DebugFormat("[ASSET GATHERER]: Getting assets for uuid references in asset {0}", embeddingAssetId);
+            if (Complete)
+                return false;
 
-            AssetBase embeddingAsset = GetAsset(embeddingAssetId);
+            while (GatherNext());
 
-            if (null != embeddingAsset)
-            {
-                string script = Utils.BytesToString(embeddingAsset.Data);
-//                m_log.DebugFormat("[ARCHIVER]: Script {0}", script);
-                MatchCollection uuidMatches = Util.PermissiveUUIDPattern.Matches(script);
-//                m_log.DebugFormat("[ARCHIVER]: Found {0} matches in text", uuidMatches.Count);
+            return true;
+        }
 
-                foreach (Match uuidMatch in uuidMatches)
+        /// <summary>
+        /// Gather all the asset uuids associated with the asset referenced by a given uuid
+        /// </summary>
+        /// <remarks>
+        /// This includes both those directly associated with
+        /// it (e.g. face textures) and recursively, those of items within it's inventory (e.g. objects contained
+        /// within this object).
+        /// This method assumes that the asset type associated with this asset in persistent storage is correct (which
+        /// should always be the case).  So with this method we always need to retrieve asset data even if the asset
+        /// is of a type which is known not to reference any other assets
+        /// </remarks>
+        /// <param name="assetUuid">The uuid of the asset for which to gather referenced assets</param>
+        private void GetAssetUuids(UUID assetUuid)
+        {
+            // avoid infinite loops
+            if (GatheredUuids.ContainsKey(assetUuid))
+                return;
+
+            try
+            {              
+                AssetBase assetBase = GetAsset(assetUuid);
+
+                if (null != assetBase)
                 {
-                    UUID uuid = new UUID(uuidMatch.Value);
-//                    m_log.DebugFormat("[ARCHIVER]: Recording {0} in text", uuid);
+                    sbyte assetType = assetBase.Type;
+                    GatheredUuids[assetUuid] = assetType;
+
+                    if ((sbyte)AssetType.Bodypart == assetType || (sbyte)AssetType.Clothing == assetType)
+                    {
+                        RecordWearableAssetUuids(assetBase);
+                    }
+                    else if ((sbyte)AssetType.Gesture == assetType)
+                    {
+                        RecordGestureAssetUuids(assetBase);
+                    }
+                    else if ((sbyte)AssetType.Notecard == assetType)
+                    {
+                        RecordTextEmbeddedAssetUuids(assetBase);
+                    }
+                    else if ((sbyte)AssetType.LSLText == assetType)
+                    {
+                        RecordTextEmbeddedAssetUuids(assetBase);
+                    }
+                    else if ((sbyte)OpenSimAssetType.Material == assetType)
+                    {
+                        RecordMaterialAssetUuids(assetBase);
+                    }
+                    else if ((sbyte)AssetType.Object == assetType)
+                    {
+                        RecordSceneObjectAssetUuids(assetBase);
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                m_log.ErrorFormat("[UUID GATHERER]: Failed to gather uuids for asset id {0}", assetUuid);
+                throw;
+            }
+        }       
 
-                    // Assume AssetIDs embedded are textures.
-                    assetUuids[uuid] = AssetType.Texture;
+        private void AddForInspection(UUID assetUuid, sbyte assetType)
+        {
+            // Here, we want to collect uuids which require further asset fetches but mark the others as gathered
+            try
+            {               
+                if ((sbyte)AssetType.Bodypart == assetType 
+                    || (sbyte)AssetType.Clothing == assetType
+                    || (sbyte)AssetType.Gesture == assetType
+                    || (sbyte)AssetType.Notecard == assetType
+                    || (sbyte)AssetType.LSLText == assetType
+                    || (sbyte)OpenSimAssetType.Material == assetType
+                    || (sbyte)AssetType.Object == assetType)
+                {
+                    AddForInspection(assetUuid);
+                }
+                else
+                {
+                    GatheredUuids[assetUuid] = assetType;
                 }
             }
+            catch (Exception)
+            {
+                m_log.ErrorFormat(
+                    "[UUID GATHERER]: Failed to gather uuids for asset id {0}, type {1}", 
+                    assetUuid, assetType);
+                throw;
+            }
         }
 
         /// <summary>
-        /// Record the uuids referenced by the given wearable asset
+        /// Collect all the asset uuids found in one face of a Texture Entry.
         /// </summary>
-        /// <param name="wearableAssetUuid"></param>
-        /// <param name="assetUuids">Dictionary in which to record the references</param>
-        private void GetWearableAssetUuids(UUID wearableAssetUuid, IDictionary<UUID, AssetType> assetUuids)
+        private void RecordTextureEntryAssetUuids(Primitive.TextureEntryFace texture)
         {
-            AssetBase assetBase = GetAsset(wearableAssetUuid);
+            GatheredUuids[texture.TextureID] = (sbyte)AssetType.Texture;
 
-            if (null != assetBase)
+            if (texture.MaterialID != UUID.Zero)
+                AddForInspection(texture.MaterialID);
+        }
+
+        /// <summary>
+        /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
+        /// stored in legacy format in part.DynAttrs
+        /// </summary>
+        /// <param name="part"></param>
+        private void RecordMaterialsUuids(SceneObjectPart part)
+        {
+            // scan thru the dynAttrs map of this part for any textures used as materials
+            OSD osdMaterials = null;
+
+            lock (part.DynAttrs)
             {
-                //m_log.Debug(new System.Text.ASCIIEncoding().GetString(bodypartAsset.Data));
-                AssetWearable wearableAsset = new AssetBodypart(wearableAssetUuid, assetBase.Data);
-                wearableAsset.Decode();
-    
-                //m_log.DebugFormat(
-                //    "[ARCHIVER]: Wearable asset {0} references {1} assets", wearableAssetUuid, wearableAsset.Textures.Count);
-    
-                foreach (UUID uuid in wearableAsset.Textures.Values)
+                if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
                 {
-                    assetUuids[uuid] = AssetType.Texture;
+                    OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+
+                    if (materialsStore == null)
+                        return;
+
+                    materialsStore.TryGetValue("Materials", out osdMaterials);
+                }
+
+                if (osdMaterials != null)
+                {
+                    //m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
+
+                    if (osdMaterials is OSDArray)
+                    {
+                        OSDArray matsArr = osdMaterials as OSDArray;
+                        foreach (OSDMap matMap in matsArr)
+                        {
+                            try
+                            {
+                                if (matMap.ContainsKey("Material"))
+                                {
+                                    OSDMap mat = matMap["Material"] as OSDMap;
+                                    if (mat.ContainsKey("NormMap"))
+                                    {
+                                        UUID normalMapId = mat["NormMap"].AsUUID();
+                                        if (normalMapId != UUID.Zero)
+                                        {
+                                            GatheredUuids[normalMapId] = (sbyte)AssetType.Texture;
+                                            //m_log.Info("[UUID Gatherer]: found normal map ID: " + normalMapId.ToString());
+                                        }
+                                    }
+                                    if (mat.ContainsKey("SpecMap"))
+                                    {
+                                        UUID specularMapId = mat["SpecMap"].AsUUID();
+                                        if (specularMapId != UUID.Zero)
+                                        {
+                                            GatheredUuids[specularMapId] = (sbyte)AssetType.Texture;
+                                            //m_log.Info("[UUID Gatherer]: found specular map ID: " + specularMapId.ToString());
+                                        }
+                                    }
+                                }
+
+                            }
+                            catch (Exception e)
+                            {
+                                m_log.Warn("[UUID Gatherer]: exception getting materials: " + e.Message);
+                            }
+                        }
+                    }
                 }
             }
         }
 
         /// <summary>
+        /// Get an asset synchronously, potentially using an asynchronous callback.  If the
+        /// asynchronous callback is used, we will wait for it to complete.
+        /// </summary>
+        /// <param name="uuid"></param>
+        /// <returns></returns>
+        protected virtual AssetBase GetAsset(UUID uuid)
+        {
+            return m_assetService.Get(uuid.ToString());
+        }
+
+        /// <summary>
+        /// Record the asset uuids embedded within the given text (e.g. a script).
+        /// </summary>
+        /// <param name="textAsset"></param>
+        private void RecordTextEmbeddedAssetUuids(AssetBase textAsset)
+        {
+            //            m_log.DebugFormat("[ASSET GATHERER]: Getting assets for uuid references in asset {0}", embeddingAssetId);
+
+            string text = Utils.BytesToString(textAsset.Data);
+//            m_log.DebugFormat("[UUID GATHERER]: Text {0}", text);
+            MatchCollection uuidMatches = Util.PermissiveUUIDPattern.Matches(text);
+//            m_log.DebugFormat("[UUID GATHERER]: Found {0} matches in text", uuidMatches.Count);
+
+            foreach (Match uuidMatch in uuidMatches)
+            {
+                UUID uuid = new UUID(uuidMatch.Value);
+//                m_log.DebugFormat("[UUID GATHERER]: Recording {0} in text", uuid);
+
+                AddForInspection(uuid);
+            }
+        }
+
+        /// <summary>
+        /// Record the uuids referenced by the given wearable asset
+        /// </summary>
+        /// <param name="assetBase"></param>
+        private void RecordWearableAssetUuids(AssetBase assetBase)
+        {
+            //m_log.Debug(new System.Text.ASCIIEncoding().GetString(bodypartAsset.Data));
+            AssetWearable wearableAsset = new AssetBodypart(assetBase.FullID, assetBase.Data);
+            wearableAsset.Decode();
+
+            //m_log.DebugFormat(
+            //    "[ARCHIVER]: Wearable asset {0} references {1} assets", wearableAssetUuid, wearableAsset.Textures.Count);
+
+            foreach (UUID uuid in wearableAsset.Textures.Values)
+                GatheredUuids[uuid] = (sbyte)AssetType.Texture;
+        }
+
+        /// <summary>
         /// Get all the asset uuids associated with a given object.  This includes both those directly associated with
         /// it (e.g. face textures) and recursively, those of items within it's inventory (e.g. objects contained
         /// within this object).
         /// </summary>
-        /// <param name="sceneObject"></param>
-        /// <param name="assetUuids"></param>
-        private void GetSceneObjectAssetUuids(UUID sceneObjectUuid, IDictionary<UUID, AssetType> assetUuids)
+        /// <param name="sceneObjectAsset"></param>
+        private void RecordSceneObjectAssetUuids(AssetBase sceneObjectAsset)
         {
-            AssetBase objectAsset = GetAsset(sceneObjectUuid);
+            string xml = Utils.BytesToString(sceneObjectAsset.Data);
 
-            if (null != objectAsset)
+            CoalescedSceneObjects coa;
+            if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
             {
-                string xml = Utils.BytesToString(objectAsset.Data);
-                
-                CoalescedSceneObjects coa;
-                if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
-                {
-                    foreach (SceneObjectGroup sog in coa.Objects)
-                        GatherAssetUuids(sog, assetUuids);
-                }
-                else
+                foreach (SceneObjectGroup sog in coa.Objects)
+                    AddForInspection(sog);
+            }
+            else
+            {
+                SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
+
+                if (null != sog)
+                    AddForInspection(sog);
+            }
+        }
+
+        /// <summary>
+        /// Get the asset uuid associated with a gesture
+        /// </summary>
+        /// <param name="gestureAsset"></param>
+        private void RecordGestureAssetUuids(AssetBase gestureAsset)
+        {           
+            using (MemoryStream ms = new MemoryStream(gestureAsset.Data))
+                using (StreamReader sr = new StreamReader(ms))
+            {
+                sr.ReadLine(); // Unknown (Version?)
+                sr.ReadLine(); // Unknown
+                sr.ReadLine(); // Unknown
+                sr.ReadLine(); // Name
+                sr.ReadLine(); // Comment ?
+                int count = Convert.ToInt32(sr.ReadLine()); // Item count
+
+                for (int i = 0 ; i < count ; i++)
                 {
-                    SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
-    
-                    if (null != sog)
-                        GatherAssetUuids(sog, assetUuids);
+                    string type = sr.ReadLine();
+                    if (type == null)
+                        break;
+                    string name = sr.ReadLine();
+                    if (name == null)
+                        break;
+                    string id = sr.ReadLine();
+                    if (id == null)
+                        break;
+                    string unknown = sr.ReadLine();
+                    if (unknown == null)
+                        break;
+
+                    // If it can be parsed as a UUID, it is an asset ID
+                    UUID uuid;
+                    if (UUID.TryParse(id, out uuid))
+                        GatheredUuids[uuid] = (sbyte)AssetType.Animation;    // the asset is either an Animation or a Sound, but this distinction isn't important
                 }
             }
         }
 
         /// <summary>
-        /// Get the asset uuid associated with a gesture
+        /// Get the asset uuid's referenced in a material.
         /// </summary>
-        /// <param name="gestureUuid"></param>
-        /// <param name="assetUuids"></param>
-        private void GetGestureAssetUuids(UUID gestureUuid, IDictionary<UUID, AssetType> assetUuids)
+        private void RecordMaterialAssetUuids(AssetBase materialAsset)
         {
-            AssetBase assetBase = GetAsset(gestureUuid);
-            if (null == assetBase)
-                return;
-
-            MemoryStream ms = new MemoryStream(assetBase.Data);
-            StreamReader sr = new StreamReader(ms);
+            OSDMap mat = (OSDMap)OSDParser.DeserializeLLSDXml(materialAsset.Data);
 
-            sr.ReadLine(); // Unknown (Version?)
-            sr.ReadLine(); // Unknown
-            sr.ReadLine(); // Unknown
-            sr.ReadLine(); // Name
-            sr.ReadLine(); // Comment ?
-            int count = Convert.ToInt32(sr.ReadLine()); // Item count
+            UUID normMap = mat["NormMap"].AsUUID();
+            if (normMap != UUID.Zero)
+                GatheredUuids[normMap] = (sbyte)AssetType.Texture;
 
-            for (int i = 0 ; i < count ; i++)
-            {
-                string type = sr.ReadLine();
-                if (type == null)
-                    break;
-                string name = sr.ReadLine();
-                if (name == null)
-                    break;
-                string id = sr.ReadLine();
-                if (id == null)
-                    break;
-                string unknown = sr.ReadLine();
-                if (unknown == null)
-                    break;
-
-                // If it can be parsed as a UUID, it is an asset ID
-                UUID uuid;
-                if (UUID.TryParse(id, out uuid))
-                    assetUuids[uuid] = AssetType.Animation;
-            }
+            UUID specMap = mat["SpecMap"].AsUUID();
+            if (specMap != UUID.Zero)
+                GatheredUuids[specMap] = (sbyte)AssetType.Texture;
         }
     }
 
@@ -374,7 +568,10 @@ namespace OpenSim.Region.Framework.Scenes
         protected string m_assetServerURL;
 
         public HGUuidGatherer(IAssetService assetService, string assetServerURL)
-            : base(assetService)
+            : this(assetService, assetServerURL, new Dictionary<UUID, sbyte>()) {}
+
+        public HGUuidGatherer(IAssetService assetService, string assetServerURL, IDictionary<UUID, sbyte> collector)
+            : base(assetService, collector)
         {
             m_assetServerURL = assetServerURL;
             if (!m_assetServerURL.EndsWith("/") && !m_assetServerURL.EndsWith("="))
@@ -391,7 +588,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         public AssetBase FetchAsset(UUID assetID)
         {
-
             // Test if it's already here
             AssetBase asset = m_assetService.Get(assetID.ToString());
             if (asset == null)