Add coalesced scene objects class and serializer. This is currently only used by the TestRezCoalescedObject() regression test.

This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc.
Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item.
Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place.
This bug will be addressed shortly.

2 files changed, 137 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
new file mode 100644
index 0000000..3af2f76
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Reflection;
+using System.Xml;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.Framework.Scenes.Serialization
+{
+    /// <summary>
+    /// Serialize and deserialize coalesced scene objects.
+    /// </summary>
+    public class CoalescedSceneObjectsSerializer
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);        
+
+        /// <summary>
+        /// Serialize coalesced objects to Xml
+        /// </summary>
+        /// <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))
+                {                    
+                    List<SceneObjectGroup> coaObjects = coa.Objects;
+                    
+//                    m_log.DebugFormat(
+//                        "[COALESCED SCENE OBJECTS SERIALIZER]: Writing {0} objects for coalesced object", 
+//                        coaObjects.Count);
+                    
+                    float minX, minY, minZ;
+                    float maxX, maxY, maxZ;
+
+                    Vector3[] offsets = Scene.GetCombinedBoundingBox(coaObjects,
+                            out minX, out maxX, out minY, out maxY,
+                            out minZ, out maxZ);
+
+                    writer.WriteStartElement("CoalescedObject");
+                    
+                    float sizeX = maxX - minX;
+                    float sizeY = maxY - minY;
+                    float sizeZ = maxZ - minZ;
+                    
+                    writer.WriteAttributeString("x", sizeX.ToString());
+                    writer.WriteAttributeString("y", sizeY.ToString());
+                    writer.WriteAttributeString("z", sizeZ.ToString());                    
+                    
+                    // Embed the offsets into the group XML
+                    for (int i = 0; i < coaObjects.Count; i++)
+                    {
+                        SceneObjectGroup obj = coaObjects[i];
+                        
+//                        m_log.DebugFormat(
+//                            "[COALESCED SCENE OBJECTS SERIALIZER]: Writing offset for object {0}, {1}", 
+//                            i, obj.Name);                        
+                        
+                        writer.WriteStartElement("SceneObjectGroup");
+                        writer.WriteAttributeString("offsetx", offsets[i].X.ToString());
+                        writer.WriteAttributeString("offsety", offsets[i].Y.ToString());
+                        writer.WriteAttributeString("offsetz", offsets[i].Z.ToString());
+                        
+                        SceneObjectSerializer.ToOriginalXmlFormat(obj, writer, true);
+                        
+                        writer.WriteEndElement();
+                    }  
+                    
+                    writer.WriteEndElement(); // CoalescedObject
+                }
+
+                string output = sw.ToString();
+                
+//                m_log.Debug(output);
+                
+                return output;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index b412e25..bb8a83a 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -139,6 +139,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 return sw.ToString();
             }
         }
+        
 
         /// <summary>
         /// Serialize a scene object to the original xml format
@@ -147,10 +148,24 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         /// <returns></returns>
         public static void ToOriginalXmlFormat(SceneObjectGroup sceneObject, XmlTextWriter writer)
         {
+            ToOriginalXmlFormat(sceneObject, writer, false);
+        }
+        
+        /// <summary>
+        /// Serialize a scene object to the original xml format
+        /// </summary>
+        /// <param name="sceneObject"></param>
+        /// <param name="writer"></param>
+        /// <param name="noRootElement">If false, don't write the enclosing SceneObjectGroup element</param>
+        /// <returns></returns>
+        public static void ToOriginalXmlFormat(SceneObjectGroup sceneObject, XmlTextWriter writer, bool noRootElement)
+        {
             //m_log.DebugFormat("[SERIALIZER]: Starting serialization of {0}", Name);
             //int time = System.Environment.TickCount;
 
-            writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty);
+            if (!noRootElement)
+                writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty);
+            
             writer.WriteStartElement(String.Empty, "RootPart", String.Empty);
             ToXmlFormat(sceneObject.RootPart, writer);
             writer.WriteEndElement();
@@ -170,10 +185,12 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
             writer.WriteEndElement(); // OtherParts
             sceneObject.SaveScriptedState(writer);
-            writer.WriteEndElement(); // SceneObjectGroup
+            
+            if (!noRootElement)
+                writer.WriteEndElement(); // SceneObjectGroup
 
             //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0}, {1}ms", Name, System.Environment.TickCount - time);
-        }
+        }        
 
         protected static void ToXmlFormat(SceneObjectPart part, XmlTextWriter writer)
         {