Merge branch 'master' into careminster-presence-refactor

11 files changed, 426 insertions, 30 deletions

diff --git a/OpenSim/Region/Framework/Scenes/CoalescedSceneObjects.cs b/OpenSim/Region/Framework/Scenes/CoalescedSceneObjects.cs
new file mode 100644
index 0000000..af8ccda
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/CoalescedSceneObjects.cs
@@ -0,0 +1,154 @@
+/*
+ * 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.Linq;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Framework.Scenes
+{
+    /// <summary>
+    /// Represents a coalescene of scene objects.  A coalescence occurs when objects that are not in the same linkset
+    /// are grouped together.
+    /// </summary>
+    public class CoalescedSceneObjects
+    {   
+        /// <summary>
+        /// The creator of this coalesence, though not necessarily the objects within it.
+        /// </summary>
+        public UUID CreatorId { get; set; }
+        
+        /// <summary>
+        /// The number of objects in this coalesence
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                lock (m_memberObjects)
+                    return m_memberObjects.Count;
+            }
+        }
+        
+        /// <summary>
+        /// Does this coalesence have any member objects?
+        /// </summary>
+        public bool HasObjects { get { return Count > 0; } }
+        
+        /// <summary>
+        /// Get the objects currently in this coalescence
+        /// </summary>
+        public List<SceneObjectGroup> Objects
+        {
+            get
+            {
+                lock (m_memberObjects)
+                    return new List<SceneObjectGroup>(m_memberObjects);
+            }
+        }               
+        
+        /// <summary>
+        /// Get the scene that contains the objects in this coalescence.  If there are no objects then null is returned.
+        /// </summary>
+        public Scene Scene 
+        { 
+            get
+            {
+                if (!HasObjects)
+                    return null;
+                else
+                    return Objects[0].Scene;
+            }
+        }
+        
+        /// <summary>
+        /// At this point, we need to preserve the order of objects added to the coalescence, since the first
+        /// one will end up matching the item name when rerezzed.
+        /// </summary>
+        protected List<SceneObjectGroup> m_memberObjects = new List<SceneObjectGroup>();
+        
+        public CoalescedSceneObjects(UUID creatorId) 
+        {
+            CreatorId = creatorId;
+        }
+        
+        public CoalescedSceneObjects(UUID creatorId, params SceneObjectGroup[] objs) : this(creatorId)
+        {            
+            foreach (SceneObjectGroup obj in objs)
+                Add(obj);
+        }
+            
+        /// <summary>
+        /// Add an object to the coalescence.
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="offset">The offset of the object within the group</param>
+        public void Add(SceneObjectGroup obj)
+        {
+            lock (m_memberObjects)
+                m_memberObjects.Add(obj);
+        }
+        
+        /// <summary>
+        /// Removes a scene object from the coalescene
+        /// </summary>
+        /// <param name="sceneObjectId"></param>
+        /// <returns>true if the object was there to be removed, false if not.</returns>
+        public bool Remove(SceneObjectGroup obj)
+        {
+            lock (m_memberObjects)
+                return m_memberObjects.Remove(obj);
+        }
+        
+        /// <summary>
+        /// Get the total size of the coalescence (the size required to cover all the objects within it) and the
+        /// offsets of each of those objects.
+        /// </summary>
+        /// <param name="size"></param>
+        /// <returns>
+        /// An array of offsets.  The order of objects is the same as returned from the Objects property
+        /// </returns>
+        public Vector3[] GetSizeAndOffsets(out Vector3 size)
+        {
+            float minX, minY, minZ;
+            float maxX, maxY, maxZ;
+
+            Vector3[] offsets 
+                = Scene.GetCombinedBoundingBox(
+                    Objects, out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
+            
+            float sizeX = maxX - minX;
+            float sizeY = maxY - minY;
+            float sizeZ = maxZ - minZ;
+            
+            size = new Vector3(sizeX, sizeY, sizeZ);
+            
+            return offsets;
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index cd6dc95..e4b0323 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -174,7 +174,11 @@ namespace OpenSim.Region.Framework.Scenes
             ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
             if (presence == null)
             {
-                m_log.WarnFormat("[PRIORITIZER] attempt to use agent {0} not in the scene",client.AgentId);
+                // this shouldn't happen, it basically means that we are prioritizing 
+                // updates to send to a client that doesn't have a presence in the scene
+                // seems like there's race condition here...
+
+                // m_log.WarnFormat("[PRIORITIZER] attempt to use agent {0} not in the scene",client.AgentId);
                 // throw new InvalidOperationException("Prioritization agent not defined");
                 return Int32.MaxValue;
             }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 0748954..f41c6b9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2005,11 +2005,49 @@ namespace OpenSim.Region.Framework.Scenes
                                     UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
                                     bool RezSelected, bool RemoveItem, UUID fromTaskID)
         {
-            IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>();
-            if (invAccess != null)
-                invAccess.RezObject(
-                    remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
-                    RezSelected, RemoveItem, fromTaskID, false);
+//            m_log.DebugFormat(
+//                "[PRIM INVENTORY]: RezObject from {0} for item {1} from task id {2}", 
+//                remoteClient.Name, itemID, fromTaskID);
+            
+            if (fromTaskID == UUID.Zero)
+            {
+                IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>();
+                if (invAccess != null)
+                    invAccess.RezObject(
+                        remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
+                        RezSelected, RemoveItem, fromTaskID, false);
+            }
+            else
+            {            
+                SceneObjectPart part = GetSceneObjectPart(fromTaskID);
+                if (part == null)
+                {
+                    m_log.ErrorFormat(                                     
+                        "[TASK INVENTORY]: {0} tried to rez item id {1} from object id {2} but there is no such scene object", 
+                        remoteClient.Name, itemID, fromTaskID);
+                    
+                    return;
+                }
+                
+                TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID);
+                if (item == null)
+                {
+                    m_log.ErrorFormat(                                     
+                        "[TASK INVENTORY]: {0} tried to rez item id {1} from object id {2} but there is no such item", 
+                        remoteClient.Name, itemID, fromTaskID);
+                    
+                    return;
+                }                
+                               
+                byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
+                Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f);
+                Vector3 pos 
+                    = GetNewRezLocation(
+                        RayStart, RayEnd, RayTargetID, Quaternion.Identity,
+                        BypassRayCast, bRayEndIsIntersection, true, scale, false);            
+                
+                RezObject(part, item, pos, null, Vector3.Zero, 0);
+            }
         }
         
         /// <summary>
@@ -2017,14 +2055,14 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="sourcePart"></param>
         /// <param name="item"></param>
-        /// <param name="pos"></param>
-        /// <param name="rot"></param>
-        /// <param name="vel"></param>
+        /// <param name="pos">The position of the rezzed object.</param>
+        /// <param name="rot">The rotation of the rezzed object.  If null, then the rotation stored with the object
+        /// will be used if it exists.</param>
+        /// <param name="vel">The velocity of the rezzed object.</param>
         /// <param name="param"></param>
         /// <returns>The SceneObjectGroup rezzed or null if rez was unsuccessful</returns>
         public virtual SceneObjectGroup RezObject(
-            SceneObjectPart sourcePart, TaskInventoryItem item,
-            Vector3 pos, Quaternion rot, Vector3 vel, int param)
+            SceneObjectPart sourcePart, TaskInventoryItem item, Vector3 pos, Quaternion? rot, Vector3 vel, int param)
         {
             if (null == item)
                 return null;
@@ -2042,8 +2080,14 @@ namespace OpenSim.Region.Framework.Scenes
                 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
                     sourcePart.Inventory.RemoveInventoryItem(item.ItemID);
             }
-                        
-            AddNewSceneObject(group, true, pos, rot, vel);
+                                    
+            AddNewSceneObject(group, true);
+            
+            group.AbsolutePosition = pos;
+            group.Velocity = vel;            
+            
+            if (rot != null)
+                group.UpdateGroupRotationR((Quaternion)rot);
             
             // We can only call this after adding the scene object, since the scene object references the scene
             // to find out if scripts should be activated at all.
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0e3cffb..eed5ebc 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5038,7 +5038,20 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public Vector3[] GetCombinedBoundingBox(List<SceneObjectGroup> objects, out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ)
+        /// <summary>
+        /// Get the volume of space that will encompass all the given objects.
+        /// </summary>
+        /// <param name="objects"></param>
+        /// <param name="minX"></param>
+        /// <param name="maxX"></param>
+        /// <param name="minY"></param>
+        /// <param name="maxY"></param>
+        /// <param name="minZ"></param>
+        /// <param name="maxZ"></param>
+        /// <returns></returns>
+        public static Vector3[] GetCombinedBoundingBox(
+           List<SceneObjectGroup> objects, 
+           out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ)
         {
             minX = 256;
             maxX = -256;
@@ -5056,6 +5069,10 @@ namespace OpenSim.Region.Framework.Scenes
                 Vector3 vec = g.AbsolutePosition;
 
                 g.GetAxisAlignedBoundingBoxRaw(out ominX, out omaxX, out ominY, out omaxY, out ominZ, out omaxZ);
+               
+//                m_log.DebugFormat(
+//                    "[SCENE]: For {0} found AxisAlignedBoundingBoxRaw {1}, {2}", 
+//                    g.Name, new Vector3(ominX, ominY, ominZ), new Vector3(omaxX, omaxY, omaxZ));
 
                 ominX += vec.X;
                 omaxX += vec.X;
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 6773e08..3d6057b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1077,6 +1077,8 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         foreach (SceneObjectPart p in ((SceneObjectGroup)entity).Parts)
                         {
+//                            m_log.DebugFormat("[SCENE GRAPH]: Part {0} has name {1}", p.UUID, p.Name);
+                        
                             if (p.Name == name)
                             {
                                 sop = p;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 759fc23..69bfb9a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -365,11 +365,14 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 Vector3 val = value;
 
-                if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W)
-                    || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) 
-                    && !IsAttachmentCheckFull() && (!m_scene.LoadingPrims))
+                if (Scene != null)
                 {
-                    m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
+                    if ((Scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || Scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W)
+                        || Scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || Scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) 
+                        && !IsAttachmentCheckFull() && (!Scene.LoadingPrims))
+                    {
+                        m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
+                    }
                 }
 
                 foreach (SceneObjectPart part in m_parts.GetArray())
@@ -381,8 +384,11 @@ namespace OpenSim.Region.Framework.Scenes
                     if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10)
                     {
                         RootPart.ScriptSetPhysicsStatus(false);
-                        Scene.SimChat(Utils.StringToBytes("Hit Sandbox Limit"),
-                              ChatTypeEnum.DebugChannel, 0x7FFFFFFF, RootPart.AbsolutePosition, Name, UUID, false);
+                        
+                        if (Scene != null)
+                            Scene.SimChat(Utils.StringToBytes("Hit Sandbox Limit"),
+                                  ChatTypeEnum.DebugChannel, 0x7FFFFFFF, RootPart.AbsolutePosition, Name, UUID, false);
+                        
                         return;
                     }
                 }
@@ -420,7 +426,8 @@ namespace OpenSim.Region.Framework.Scenes
                 //m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor);
                 //}
                 
-                m_scene.EventManager.TriggerParcelPrimCountTainted();
+                if (Scene != null)
+                    Scene.EventManager.TriggerParcelPrimCountTainted();
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
new file mode 100644
index 0000000..babcb54
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -0,0 +1,149 @@
+/*
+ * 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>
+    /// <remarks>
+    /// Deserialization not yet here.
+    /// </remarks>
+    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)
+        {            
+            using (StringWriter sw = new StringWriter())
+            {
+                using (XmlTextWriter writer = new XmlTextWriter(sw))
+                {                                        
+                    Vector3 size;
+                    
+                    List<SceneObjectGroup> coaObjects = coa.Objects;
+                    
+//                    m_log.DebugFormat(
+//                        "[COALESCED SCENE OBJECTS SERIALIZER]: Writing {0} objects for coalesced object", 
+//                        coaObjects.Count);
+                    
+                    // This is weak - we're relying on the set of coalesced objects still being identical
+                    Vector3[] offsets = coa.GetSizeAndOffsets(out size);
+
+                    writer.WriteStartElement("CoalescedObject");
+                    
+                    writer.WriteAttributeString("x", size.X.ToString());
+                    writer.WriteAttributeString("y", size.Y.ToString());
+                    writer.WriteAttributeString("z", size.Z.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(); // SceneObjectGroup
+                    }  
+                    
+                    writer.WriteEndElement(); // CoalescedObject
+                }
+
+                string output = sw.ToString();
+                
+//                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
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index b2b3ad9..769d8a5 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)
         {
@@ -1318,7 +1335,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 writer.WriteStartElement("SculptData");
                 byte[] sd;
                 if (shp.SculptData != null)
-                    sd = shp.ExtraParams;
+                    sd = shp.SculptData;
                 else
                     sd = Utils.EmptyBytes;
                 writer.WriteBase64(sd, 0, sd.Length);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 8588f7f..dd28416 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -117,11 +117,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             ISharedRegionModule interregionComms = new LocalSimulationConnectorModule();
 
 
-            Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010,  "grid");
+            Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010);
             SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms);
             sceneB.RegisterRegionWithGrid();
 
-            Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, "grid");
+            Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000);
             SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
             sceneA.RegisterRegionWithGrid();
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index 8138bcc..2aef4b0 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Region.Framework.Tests
             TestHelper.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
-            Scene scene = SceneSetupHelpers.SetupScene("inventory");
+            Scene scene = SceneSetupHelpers.SetupScene();
             UserAccount user1 = CreateUser(scene);
             SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID);
             SceneObjectPart sop1 = sog1.RootPart;
@@ -127,7 +127,7 @@ namespace OpenSim.Region.Framework.Tests
             TestHelper.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
-            Scene scene = SceneSetupHelpers.SetupScene("inventory");
+            Scene scene = SceneSetupHelpers.SetupScene();
             UserAccount user1 = CreateUser(scene);
             SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID);
             SceneObjectPart sop1 = sog1.RootPart;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index 6b70865..dbf9e0f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -47,7 +47,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [SetUp]
         public void Init()
         {
-            m_assetService = new MockAssetService();
+            // FIXME: We don't need a full scene here - it would be enough to set up the asset service.
+            Scene scene = SceneSetupHelpers.SetupScene();
+            m_assetService = scene.AssetService;
             m_uuidGatherer = new UuidGatherer(m_assetService);
         }