4 files changed, 49 insertions, 26 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 01170aa..f3d2f26 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -471,16 +471,30 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     if (m_creatorIdForAssetId.ContainsKey(assetId))
                     {
                         string xmlData = Utils.BytesToString(data);
-                        SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);                        
-                        foreach (SceneObjectPart sop in sog.Parts)
+                        List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
+                        
+                        CoalescedSceneObjects coa = null;
+                        if (CoalescedSceneObjectsSerializer.TryFromXml(xmlData, out coa))
+                        {
+//                            m_log.DebugFormat(
+//                                "[INVENTORY ARCHIVER]: Loaded coalescence {0} has {1} objects", assetId, coa.Count);
+                            
+                            sceneObjects.AddRange(coa.Objects);
+                        }
+                        else
                         {
-                            if (sop.CreatorData == null || sop.CreatorData == "")
-                            {
-                                sop.CreatorID = m_creatorIdForAssetId[assetId];
-                            }
+                            sceneObjects.Add(SceneObjectSerializer.FromOriginalXmlFormat(xmlData));
                         }
                         
-                        data = Utils.StringToBytes(SceneObjectSerializer.ToOriginalXmlFormat(sog));
+                        foreach (SceneObjectGroup sog in sceneObjects)
+                            foreach (SceneObjectPart sop in sog.Parts)
+                                if (sop.CreatorData == null || sop.CreatorData == "")
+                                    sop.CreatorID = m_creatorIdForAssetId[assetId];
+
+                        if (coa != null)
+                            data = Utils.StringToBytes(CoalescedSceneObjectsSerializer.ToXml(coa));
+                        else
+                            data = Utils.StringToBytes(SceneObjectSerializer.ToOriginalXmlFormat(sceneObjects[0]));
                     }
                 }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
index f2d050c..e2316f0 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             InventoryItemBase coaItem = new InventoryItemBase();
             coaItem.Name = m_coaItemName;
             coaItem.ID = UUID.Parse("00000000-0000-0000-0000-000000000180");            
-            coaItem.AssetID = asset1.FullID;
+            coaItem.AssetID = coaAsset.FullID;
             coaItem.GroupID = UUID.Random();
             coaItem.CreatorIdAsUuid = m_uaLL1.PrincipalID;
             coaItem.Owner = m_uaLL1.PrincipalID;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 0c4e364..f747c89 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -62,9 +62,33 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             SerialiserModule serialiserModule = new SerialiserModule();
             m_archiverModule = new InventoryArchiverModule();
 
-            m_scene = SceneSetupHelpers.SetupScene("Inventory");
+            m_scene = SceneSetupHelpers.SetupScene("asset inventory");
             SceneSetupHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);            
         }
+                
+        [Test]
+        public void TestLoadCoalesecedItem()
+        {
+            TestHelper.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+            
+            UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaLL1, "password");
+            m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "password", m_iarStream);            
+            
+            InventoryItemBase coaItem
+                = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaLL1.PrincipalID, m_coaItemName);
+            
+            Assert.That(coaItem, Is.Not.Null, "Didn't find loaded item 1");            
+            
+            string assetXml = AssetHelpers.ReadAssetAsString(m_scene.AssetService, coaItem.AssetID);
+            
+            CoalescedSceneObjects coa;            
+            bool readResult = CoalescedSceneObjectsSerializer.TryFromXml(assetXml, out coa);
+            
+            Assert.That(readResult, Is.True);
+            
+            // TODO: Check that the loaded coalesence is valid and that the required scene object assets are around
+        }        
         
         /// <summary>
         /// Test saving a single inventory item to a V0.1 OpenSim Inventory Archive 
@@ -257,22 +281,5 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             
             Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaMT.PrincipalID));            
         }
-        
-        [Test]
-        public void TestLoadCoalesecedItem()
-        {
-            TestHelper.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
-            
-            UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaLL1, "password");
-            m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "password", m_iarStream);            
-            
-            InventoryItemBase coaItem
-                = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaLL1.PrincipalID, m_coaItemName);
-            
-            Assert.That(coaItem, Is.Not.Null, "Didn't find loaded item 1");            
-            
-            // TODO: Check that the loaded coalesence is valid and that the required scene object assets are around
-        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index 1b3419d..51d1d59 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -195,6 +195,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
         public byte[] GetData(string id)
         {
+//            m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Requesting data for asset {0}", id);
+            
             AssetBase asset = m_Cache.Get(id);
 
             if (asset != null)