Make all the objects in a coalescence reappears after being loaded from an IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing.

From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object.  However, root part uuids may well still be missing, and there may be other odd artifacts from this bug.
It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.

1 files changed, 41 insertions, 6 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index a0e120a..babcb54 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -55,11 +55,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         /// <param name="coa"></param>
         /// <returns></returns>
         public static string ToXml(CoalescedSceneObjects coa)
-        {
-            // TODO: Should probably return an empty xml serialization rather than a blank string
-            if (!coa.HasObjects)
-                return "";
-            
+        {            
             using (StringWriter sw = new StringWriter())
             {
                 using (XmlTextWriter writer = new XmlTextWriter(sw))
@@ -105,10 +101,49 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
                 string output = sw.ToString();
                 
-//                m_log.Debug(output);
+//                Console.WriteLine(output);
                 
                 return output;
             }
         }
+        
+        public static bool TryFromXml(string xml, out CoalescedSceneObjects coa)
+        {
+//            m_log.DebugFormat("[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() deserializing {0}", xml);
+            
+            coa = null;
+            
+            using (StringReader sr = new StringReader(xml))
+            {                
+                using (XmlTextReader reader = new XmlTextReader(sr))
+                {
+                    reader.Read();
+                    if (reader.Name != "CoalescedObject")
+                    {
+//                        m_log.DebugFormat(
+//                            "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false", 
+//                            reader.Name);
+                        
+                        return false;
+                    }
+                    
+                    coa = new CoalescedSceneObjects(UUID.Zero);                    
+                    reader.Read();                                            
+                    
+                    while (reader.NodeType != XmlNodeType.EndElement && reader.Name != "CoalescedObject")
+                    {
+                        if (reader.Name == "SceneObjectGroup")
+                        {
+                            string soXml = reader.ReadOuterXml();
+                            coa.Add(SceneObjectSerializer.FromOriginalXmlFormat(soXml));
+                        }
+                    }
+                    
+                    reader.ReadEndElement(); // CoalescedObject
+                }
+            }
+            
+            return true;
+        }
     }
 }
\ No newline at end of file