Merge branch 'master' of ssh://MyConnection/var/git/opensim

3 files changed, 1389 insertions, 15 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 8140d42..39b109b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2694,7 +2694,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void PreloadSound(string sound)
         {
             // UUID ownerID = OwnerID;
-            UUID objectID = UUID;
+            UUID objectID = ParentGroup.RootPart.UUID;
             UUID soundID = UUID.Zero;
 
             if (!UUID.TryParse(sound, out soundID))
@@ -3101,7 +3101,7 @@ namespace OpenSim.Region.Framework.Scenes
                 volume = 0;
 
             UUID ownerID = _ownerID;
-            UUID objectID = UUID;
+            UUID objectID = ParentGroup.RootPart.UUID;
             UUID parentID = GetRootPartUUID();
             UUID soundID = UUID.Zero;
             Vector3 position = AbsolutePosition; // region local
@@ -3138,11 +3138,11 @@ namespace OpenSim.Region.Framework.Scenes
                         else
                             soundModule.PlayAttachedSound(soundID, ownerID, objectID, volume, position, flags, radius);
                         ParentGroup.PlaySoundMasterPrim = this;
-                        ownerID = this._ownerID;
-                        objectID = this.UUID;
-                        parentID = this.GetRootPartUUID();
-                        position = this.AbsolutePosition; // region local
-                        regionHandle = this.ParentGroup.Scene.RegionInfo.RegionHandle;
+                        ownerID = _ownerID;
+                        objectID = ParentGroup.RootPart.UUID;
+                        parentID = GetRootPartUUID();
+                        position = AbsolutePosition; // region local
+                        regionHandle = ParentGroup.Scene.RegionInfo.RegionHandle;
                         if (triggered)
                             soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, radius);
                         else
@@ -3150,7 +3150,7 @@ namespace OpenSim.Region.Framework.Scenes
                         foreach (SceneObjectPart prim in ParentGroup.PlaySoundSlavePrims)
                         {
                             ownerID = prim._ownerID;
-                            objectID = prim.UUID;
+                            objectID = prim.ParentGroup.RootPart.UUID;
                             parentID = prim.GetRootPartUUID();
                             position = prim.AbsolutePosition; // region local
                             regionHandle = prim.ParentGroup.Scene.RegionInfo.RegionHandle;
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index f5f6b90..2c6d999 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -26,6 +26,8 @@
  */
 
 using System;
+using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using System.Reflection;
 using System.Xml;
@@ -294,5 +296,1356 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
             //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0} to XML2, {1}ms", Name, System.Environment.TickCount - time);
         }
+
+        #region manual serialization
+
+        private delegate void SOPXmlProcessor(SceneObjectPart sop, XmlTextReader reader);
+        private static Dictionary<string, SOPXmlProcessor> m_SOPXmlProcessors = new Dictionary<string, SOPXmlProcessor>();
+
+        private delegate void TaskInventoryXmlProcessor(TaskInventoryItem item, XmlTextReader reader);
+        private static Dictionary<string, TaskInventoryXmlProcessor> m_TaskInventoryXmlProcessors = new Dictionary<string, TaskInventoryXmlProcessor>();
+
+        private delegate void ShapeXmlProcessor(PrimitiveBaseShape shape, XmlTextReader reader);
+        private static Dictionary<string, ShapeXmlProcessor> m_ShapeXmlProcessors = new Dictionary<string, ShapeXmlProcessor>();
+
+        static SceneObjectSerializer()
+        {
+            #region SOPXmlProcessors initialization
+            m_SOPXmlProcessors.Add("AllowedDrop", ProcessAllowedDrop);
+            m_SOPXmlProcessors.Add("CreatorID", ProcessCreatorID);
+            m_SOPXmlProcessors.Add("FolderID", ProcessFolderID);
+            m_SOPXmlProcessors.Add("InventorySerial", ProcessInventorySerial);
+            m_SOPXmlProcessors.Add("TaskInventory", ProcessTaskInventory);
+            m_SOPXmlProcessors.Add("ObjectFlags", ProcessObjectFlags);
+            m_SOPXmlProcessors.Add("UUID", ProcessUUID);
+            m_SOPXmlProcessors.Add("LocalId", ProcessLocalId);
+            m_SOPXmlProcessors.Add("Name", ProcessName);
+            m_SOPXmlProcessors.Add("Material", ProcessMaterial);
+            m_SOPXmlProcessors.Add("PassTouches", ProcessPassTouches);
+            m_SOPXmlProcessors.Add("RegionHandle", ProcessRegionHandle);
+            m_SOPXmlProcessors.Add("ScriptAccessPin", ProcessScriptAccessPin);
+            m_SOPXmlProcessors.Add("GroupPosition", ProcessGroupPosition);
+            m_SOPXmlProcessors.Add("OffsetPosition", ProcessOffsetPosition);
+            m_SOPXmlProcessors.Add("RotationOffset", ProcessRotationOffset);
+            m_SOPXmlProcessors.Add("Velocity", ProcessVelocity);
+            m_SOPXmlProcessors.Add("AngularVelocity", ProcessAngularVelocity);
+            m_SOPXmlProcessors.Add("Acceleration", ProcessAcceleration);
+            m_SOPXmlProcessors.Add("Description", ProcessDescription);
+            m_SOPXmlProcessors.Add("Color", ProcessColor);
+            m_SOPXmlProcessors.Add("Text", ProcessText);
+            m_SOPXmlProcessors.Add("SitName", ProcessSitName);
+            m_SOPXmlProcessors.Add("TouchName", ProcessTouchName);
+            m_SOPXmlProcessors.Add("LinkNum", ProcessLinkNum);
+            m_SOPXmlProcessors.Add("ClickAction", ProcessClickAction);
+            m_SOPXmlProcessors.Add("Shape", ProcessShape);
+            m_SOPXmlProcessors.Add("Scale", ProcessScale);
+            m_SOPXmlProcessors.Add("UpdateFlag", ProcessUpdateFlag);
+            m_SOPXmlProcessors.Add("SitTargetOrientation", ProcessSitTargetOrientation);
+            m_SOPXmlProcessors.Add("SitTargetPosition", ProcessSitTargetPosition);
+            m_SOPXmlProcessors.Add("SitTargetPositionLL", ProcessSitTargetPositionLL);
+            m_SOPXmlProcessors.Add("SitTargetOrientationLL", ProcessSitTargetOrientationLL);
+            m_SOPXmlProcessors.Add("ParentID", ProcessParentID);
+            m_SOPXmlProcessors.Add("CreationDate", ProcessCreationDate);
+            m_SOPXmlProcessors.Add("Category", ProcessCategory);
+            m_SOPXmlProcessors.Add("SalePrice", ProcessSalePrice);
+            m_SOPXmlProcessors.Add("ObjectSaleType", ProcessObjectSaleType);
+            m_SOPXmlProcessors.Add("OwnershipCost", ProcessOwnershipCost);
+            m_SOPXmlProcessors.Add("GroupID", ProcessGroupID);
+            m_SOPXmlProcessors.Add("OwnerID", ProcessOwnerID);
+            m_SOPXmlProcessors.Add("LastOwnerID", ProcessLastOwnerID);
+            m_SOPXmlProcessors.Add("BaseMask", ProcessBaseMask);
+            m_SOPXmlProcessors.Add("OwnerMask", ProcessOwnerMask);
+            m_SOPXmlProcessors.Add("GroupMask", ProcessGroupMask);
+            m_SOPXmlProcessors.Add("EveryoneMask", ProcessEveryoneMask);
+            m_SOPXmlProcessors.Add("NextOwnerMask", ProcessNextOwnerMask);
+            m_SOPXmlProcessors.Add("Flags", ProcessFlags);
+            m_SOPXmlProcessors.Add("CollisionSound", ProcessCollisionSound);
+            m_SOPXmlProcessors.Add("CollisionSoundVolume", ProcessCollisionSoundVolume);
+            #endregion
+
+            #region TaskInventoryXmlProcessors initialization
+            m_TaskInventoryXmlProcessors.Add("AssetID", ProcessTIAssetID);
+            m_TaskInventoryXmlProcessors.Add("BasePermissions", ProcessTIBasePermissions);
+            m_TaskInventoryXmlProcessors.Add("CreationDate", ProcessTICreationDate);
+            m_TaskInventoryXmlProcessors.Add("CreatorID", ProcessTICreatorID);
+            m_TaskInventoryXmlProcessors.Add("Description", ProcessTIDescription);
+            m_TaskInventoryXmlProcessors.Add("EveryonePermissions", ProcessTIEveryonePermissions);
+            m_TaskInventoryXmlProcessors.Add("Flags", ProcessTIFlags);
+            m_TaskInventoryXmlProcessors.Add("GroupID", ProcessTIGroupID);
+            m_TaskInventoryXmlProcessors.Add("GroupPermissions", ProcessTIGroupPermissions);
+            m_TaskInventoryXmlProcessors.Add("InvType", ProcessTIInvType);
+            m_TaskInventoryXmlProcessors.Add("ItemID", ProcessTIItemID);
+            m_TaskInventoryXmlProcessors.Add("OldItemID", ProcessTIOldItemID);
+            m_TaskInventoryXmlProcessors.Add("LastOwnerID", ProcessTILastOwnerID);
+            m_TaskInventoryXmlProcessors.Add("Name", ProcessTIName);
+            m_TaskInventoryXmlProcessors.Add("NextPermissions", ProcessTINextPermissions);
+            m_TaskInventoryXmlProcessors.Add("OwnerID", ProcessTIOwnerID);
+            m_TaskInventoryXmlProcessors.Add("CurrentPermissions", ProcessTICurrentPermissions);
+            m_TaskInventoryXmlProcessors.Add("ParentID", ProcessTIParentID);
+            m_TaskInventoryXmlProcessors.Add("ParentPartID", ProcessTIParentPartID);
+            m_TaskInventoryXmlProcessors.Add("PermsGranter", ProcessTIPermsGranter);
+            m_TaskInventoryXmlProcessors.Add("PermsMask", ProcessTIPermsMask);
+            m_TaskInventoryXmlProcessors.Add("Type", ProcessTIType);
+            #endregion
+
+            #region ShapeXmlProcessors initialization
+            m_ShapeXmlProcessors.Add("ProfileCurve", ProcessShpProfileCurve);
+            m_ShapeXmlProcessors.Add("TextureEntry", ProcessShpTextureEntry);
+            m_ShapeXmlProcessors.Add("ExtraParams", ProcessShpExtraParams);
+            m_ShapeXmlProcessors.Add("PathBegin", ProcessShpPathBegin);
+            m_ShapeXmlProcessors.Add("PathCurve", ProcessShpPathCurve);
+            m_ShapeXmlProcessors.Add("PathEnd", ProcessShpPathEnd);
+            m_ShapeXmlProcessors.Add("PathRadiusOffset", ProcessShpPathRadiusOffset);
+            m_ShapeXmlProcessors.Add("PathRevolutions", ProcessShpPathRevolutions);
+            m_ShapeXmlProcessors.Add("PathScaleX", ProcessShpPathScaleX);
+            m_ShapeXmlProcessors.Add("PathScaleY", ProcessShpPathScaleY);
+            m_ShapeXmlProcessors.Add("PathShearX", ProcessShpPathShearX);
+            m_ShapeXmlProcessors.Add("PathShearY", ProcessShpPathShearY);
+            m_ShapeXmlProcessors.Add("PathSkew", ProcessShpPathSkew);
+            m_ShapeXmlProcessors.Add("PathTaperX", ProcessShpPathTaperX);
+            m_ShapeXmlProcessors.Add("PathTaperY", ProcessShpPathTaperY);
+            m_ShapeXmlProcessors.Add("PathTwist", ProcessShpPathTwist);
+            m_ShapeXmlProcessors.Add("PathTwistBegin", ProcessShpPathTwistBegin);
+            m_ShapeXmlProcessors.Add("PCode", ProcessShpPCode);
+            m_ShapeXmlProcessors.Add("ProfileBegin", ProcessShpProfileBegin);
+            m_ShapeXmlProcessors.Add("ProfileEnd", ProcessShpProfileEnd);
+            m_ShapeXmlProcessors.Add("ProfileHollow", ProcessShpProfileHollow);
+            m_ShapeXmlProcessors.Add("Scale", ProcessShpScale);
+            m_ShapeXmlProcessors.Add("State", ProcessShpState);
+            m_ShapeXmlProcessors.Add("ProfileShape", ProcessShpProfileShape);
+            m_ShapeXmlProcessors.Add("HollowShape", ProcessShpHollowShape);
+            m_ShapeXmlProcessors.Add("SculptTexture", ProcessShpSculptTexture);
+            m_ShapeXmlProcessors.Add("SculptType", ProcessShpSculptType);
+            m_ShapeXmlProcessors.Add("SculptData", ProcessShpSculptData);
+            m_ShapeXmlProcessors.Add("FlexiSoftness", ProcessShpFlexiSoftness);
+            m_ShapeXmlProcessors.Add("FlexiTension", ProcessShpFlexiTension);
+            m_ShapeXmlProcessors.Add("FlexiDrag", ProcessShpFlexiDrag);
+            m_ShapeXmlProcessors.Add("FlexiGravity", ProcessShpFlexiGravity);
+            m_ShapeXmlProcessors.Add("FlexiWind", ProcessShpFlexiWind);
+            m_ShapeXmlProcessors.Add("FlexiForceX", ProcessShpFlexiForceX);
+            m_ShapeXmlProcessors.Add("FlexiForceY", ProcessShpFlexiForceY);
+            m_ShapeXmlProcessors.Add("FlexiForceZ", ProcessShpFlexiForceZ);
+            m_ShapeXmlProcessors.Add("LightColorR", ProcessShpLightColorR);
+            m_ShapeXmlProcessors.Add("LightColorG", ProcessShpLightColorG);
+            m_ShapeXmlProcessors.Add("LightColorB", ProcessShpLightColorB);
+            m_ShapeXmlProcessors.Add("LightColorA", ProcessShpLightColorA);
+            m_ShapeXmlProcessors.Add("LightRadius", ProcessShpLightRadius);
+            m_ShapeXmlProcessors.Add("LightCutoff", ProcessShpLightCutoff);
+            m_ShapeXmlProcessors.Add("LightFalloff", ProcessShpLightFalloff);
+            m_ShapeXmlProcessors.Add("LightIntensity", ProcessShpLightIntensity);
+            m_ShapeXmlProcessors.Add("FlexiEntry", ProcessShpFlexiEntry);
+            m_ShapeXmlProcessors.Add("LightEntry", ProcessShpLightEntry);
+            m_ShapeXmlProcessors.Add("SculptEntry", ProcessShpSculptEntry);
+            #endregion
+        }
+
+        #region SOPXmlProcessors
+        private static void ProcessAllowedDrop(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.AllowedDrop = reader.ReadElementContentAsBoolean("AllowedDrop", String.Empty);
+        }
+
+        private static void ProcessCreatorID(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.CreatorID = ReadUUID(reader, "CreatorID");
+        }
+
+        private static void ProcessFolderID(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.FolderID = ReadUUID(reader, "FolderID");
+        }
+
+        private static void ProcessInventorySerial(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.InventorySerial = (uint)reader.ReadElementContentAsInt("InventorySerial", String.Empty);
+        }
+
+        private static void ProcessTaskInventory(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.TaskInventory = ReadTaskInventory(reader, "TaskInventory");
+        }
+
+        private static void ProcessObjectFlags(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.Flags = (PrimFlags)reader.ReadElementContentAsInt("ObjectFlags", String.Empty);
+        }
+
+        private static void ProcessUUID(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.UUID = ReadUUID(reader, "UUID");
+        }
+
+        private static void ProcessLocalId(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.LocalId = (uint)reader.ReadElementContentAsLong("LocalId", String.Empty);
+        }
+
+        private static void ProcessName(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.Name = reader.ReadElementString("Name");
+        }
+
+        private static void ProcessMaterial(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.Material = (byte)reader.ReadElementContentAsInt("Material", String.Empty);
+        }
+
+        private static void ProcessPassTouches(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.PassTouches = reader.ReadElementContentAsBoolean("PassTouches", String.Empty);
+        }
+
+        private static void ProcessRegionHandle(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.RegionHandle = (ulong)reader.ReadElementContentAsLong("RegionHandle", String.Empty);
+        }
+
+        private static void ProcessScriptAccessPin(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.ScriptAccessPin = reader.ReadElementContentAsInt("ScriptAccessPin", String.Empty);
+        }
+
+        private static void ProcessGroupPosition(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.GroupPosition = ReadVector(reader, "GroupPosition");
+        }
+
+        private static void ProcessOffsetPosition(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.OffsetPosition = ReadVector(reader, "OffsetPosition"); ;
+        }
+
+        private static void ProcessRotationOffset(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.RotationOffset = ReadQuaternion(reader, "RotationOffset");
+        }
+
+        private static void ProcessVelocity(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.Velocity = ReadVector(reader, "Velocity");
+        }
+
+        private static void ProcessAngularVelocity(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.AngularVelocity = ReadVector(reader, "AngularVelocity");
+        }
+
+        private static void ProcessAcceleration(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.Acceleration = ReadVector(reader, "Acceleration");
+        }
+
+        private static void ProcessDescription(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.Description = reader.ReadElementString("Description");
+        }
+
+        private static void ProcessColor(SceneObjectPart obj, XmlTextReader reader)
+        {
+            reader.ReadStartElement("Color");
+            if (reader.Name == "R")
+            {
+                float r = reader.ReadElementContentAsFloat("R", String.Empty);
+                float g = reader.ReadElementContentAsFloat("G", String.Empty);
+                float b = reader.ReadElementContentAsFloat("B", String.Empty);
+                float a = reader.ReadElementContentAsFloat("A", String.Empty);
+                obj.Color = Color.FromArgb((int)a, (int)r, (int)g, (int)b);
+                reader.ReadEndElement();
+            }
+        }
+
+        private static void ProcessText(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.Text = reader.ReadElementString("Text", String.Empty);
+        }
+
+        private static void ProcessSitName(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.SitName = reader.ReadElementString("SitName", String.Empty);
+        }
+
+        private static void ProcessTouchName(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.TouchName = reader.ReadElementString("TouchName", String.Empty);
+        }
+
+        private static void ProcessLinkNum(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.LinkNum = reader.ReadElementContentAsInt("LinkNum", String.Empty);
+        }
+
+        private static void ProcessClickAction(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.ClickAction = (byte)reader.ReadElementContentAsInt("ClickAction", String.Empty);
+        }
+
+        private static void ProcessShape(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.Shape = ReadShape(reader, "Shape");
+        }
+
+        private static void ProcessScale(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.Scale = ReadVector(reader, "Scale");
+        }
+
+        private static void ProcessUpdateFlag(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.UpdateFlag = (byte)reader.ReadElementContentAsInt("UpdateFlag", String.Empty);
+        }
+
+        private static void ProcessSitTargetOrientation(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.SitTargetOrientation = ReadQuaternion(reader, "SitTargetOrientation");
+        }
+
+        private static void ProcessSitTargetPosition(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.SitTargetPosition = ReadVector(reader, "SitTargetPosition");
+        }
+
+        private static void ProcessSitTargetPositionLL(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.SitTargetPositionLL = ReadVector(reader, "SitTargetPositionLL");
+        }
+
+        private static void ProcessSitTargetOrientationLL(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.SitTargetOrientationLL = ReadQuaternion(reader, "SitTargetOrientationLL");
+        }
+
+        private static void ProcessParentID(SceneObjectPart obj, XmlTextReader reader)
+        {
+            string str = reader.ReadElementContentAsString("ParentID", String.Empty);
+            obj.ParentID = Convert.ToUInt32(str);
+        }
+
+        private static void ProcessCreationDate(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.CreationDate = reader.ReadElementContentAsInt("CreationDate", String.Empty);
+        }
+
+        private static void ProcessCategory(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.Category = (uint)reader.ReadElementContentAsInt("Category", String.Empty);
+        }
+
+        private static void ProcessSalePrice(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.SalePrice = reader.ReadElementContentAsInt("SalePrice", String.Empty);
+        }
+
+        private static void ProcessObjectSaleType(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.ObjectSaleType = (byte)reader.ReadElementContentAsInt("ObjectSaleType", String.Empty);
+        }
+
+        private static void ProcessOwnershipCost(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.OwnershipCost = reader.ReadElementContentAsInt("OwnershipCost", String.Empty);
+        }
+
+        private static void ProcessGroupID(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.GroupID = ReadUUID(reader, "GroupID");
+        }
+
+        private static void ProcessOwnerID(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.OwnerID = ReadUUID(reader, "OwnerID");
+        }
+
+        private static void ProcessLastOwnerID(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.LastOwnerID = ReadUUID(reader, "LastOwnerID");
+        }
+
+        private static void ProcessBaseMask(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.BaseMask = (uint)reader.ReadElementContentAsInt("BaseMask", String.Empty);
+        }
+
+        private static void ProcessOwnerMask(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.OwnerMask = (uint)reader.ReadElementContentAsInt("OwnerMask", String.Empty);
+        }
+
+        private static void ProcessGroupMask(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.GroupMask = (uint)reader.ReadElementContentAsInt("GroupMask", String.Empty);
+        }
+
+        private static void ProcessEveryoneMask(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.EveryoneMask = (uint)reader.ReadElementContentAsInt("EveryoneMask", String.Empty);
+        }
+
+        private static void ProcessNextOwnerMask(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.NextOwnerMask = (uint)reader.ReadElementContentAsInt("NextOwnerMask", String.Empty);
+        }
+
+        private static void ProcessFlags(SceneObjectPart obj, XmlTextReader reader)
+        {
+            string value = reader.ReadElementContentAsString("Flags", String.Empty);
+            // !!!!! to deal with flags without commas
+            if (value.Contains(" ") && !value.Contains(","))
+                value = value.Replace(" ", ", ");
+            obj.Flags = (PrimFlags)Enum.Parse(typeof(PrimFlags), value);
+        }
+
+        private static void ProcessCollisionSound(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.CollisionSound = ReadUUID(reader, "CollisionSound");
+        }
+
+        private static void ProcessCollisionSoundVolume(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.CollisionSoundVolume = reader.ReadElementContentAsFloat("CollisionSoundVolume", String.Empty);
+        }
+        #endregion
+
+        #region TaskInventoryXmlProcessors
+        private static void ProcessTIAssetID(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.AssetID = ReadUUID(reader, "AssetID");
+        }
+
+        private static void ProcessTIBasePermissions(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.BasePermissions = (uint)reader.ReadElementContentAsInt("BasePermissions", String.Empty);
+        }
+
+        private static void ProcessTICreationDate(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.CreationDate = (uint)reader.ReadElementContentAsInt("CreationDate", String.Empty);
+        }
+
+        private static void ProcessTICreatorID(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.CreatorID = ReadUUID(reader, "CreatorID");
+        }
+
+        private static void ProcessTIDescription(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.Description = reader.ReadElementContentAsString("Description", String.Empty);
+        }
+
+        private static void ProcessTIEveryonePermissions(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.EveryonePermissions = (uint)reader.ReadElementContentAsInt("EveryonePermissions", String.Empty);
+        }
+
+        private static void ProcessTIFlags(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.Flags = (uint)reader.ReadElementContentAsInt("Flags", String.Empty);
+        }
+
+        private static void ProcessTIGroupID(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.GroupID = ReadUUID(reader, "GroupID");
+        }
+
+        private static void ProcessTIGroupPermissions(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.GroupPermissions = (uint)reader.ReadElementContentAsInt("GroupPermissions", String.Empty);
+        }
+
+        private static void ProcessTIInvType(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.InvType = reader.ReadElementContentAsInt("InvType", String.Empty);
+        }
+
+        private static void ProcessTIItemID(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.ItemID = ReadUUID(reader, "ItemID");
+        }
+
+        private static void ProcessTIOldItemID(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.OldItemID = ReadUUID(reader, "OldItemID");
+        }
+
+        private static void ProcessTILastOwnerID(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.LastOwnerID = ReadUUID(reader, "LastOwnerID");
+        }
+
+        private static void ProcessTIName(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.Name = reader.ReadElementContentAsString("Name", String.Empty);
+        }
+
+        private static void ProcessTINextPermissions(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.NextPermissions = (uint)reader.ReadElementContentAsInt("NextPermissions", String.Empty);
+        }
+
+        private static void ProcessTIOwnerID(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.OwnerID = ReadUUID(reader, "OwnerID");
+        }
+
+        private static void ProcessTICurrentPermissions(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.CurrentPermissions = (uint)reader.ReadElementContentAsInt("CurrentPermissions", String.Empty);
+        }
+
+        private static void ProcessTIParentID(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.ParentID = ReadUUID(reader, "ParentID");
+        }
+
+        private static void ProcessTIParentPartID(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.ParentPartID = ReadUUID(reader, "ParentPartID");
+        }
+
+        private static void ProcessTIPermsGranter(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.PermsGranter = ReadUUID(reader, "PermsGranter");
+        }
+
+        private static void ProcessTIPermsMask(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.PermsMask = reader.ReadElementContentAsInt("PermsMask", String.Empty);
+        }
+
+        private static void ProcessTIType(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.Type = reader.ReadElementContentAsInt("Type", String.Empty);
+        }
+
+        #endregion
+
+        #region ShapeXmlProcessors
+        private static void ProcessShpProfileCurve(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.ProfileCurve = (byte)reader.ReadElementContentAsInt("ProfileCurve", String.Empty);
+        }
+
+        private static void ProcessShpTextureEntry(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            byte[] teData = Convert.FromBase64String(reader.ReadElementString("TextureEntry"));
+            shp.Textures = new Primitive.TextureEntry(teData, 0, teData.Length);   
+        }
+
+        private static void ProcessShpExtraParams(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.ExtraParams = Convert.FromBase64String(reader.ReadElementString("ExtraParams"));
+        }
+
+        private static void ProcessShpPathBegin(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathBegin = (ushort)reader.ReadElementContentAsInt("PathBegin", String.Empty);
+        }
+
+        private static void ProcessShpPathCurve(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathCurve = (byte)reader.ReadElementContentAsInt("PathCurve", String.Empty);
+        }
+
+        private static void ProcessShpPathEnd(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathEnd = (ushort)reader.ReadElementContentAsInt("PathEnd", String.Empty);
+        }
+
+        private static void ProcessShpPathRadiusOffset(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathRadiusOffset = (sbyte)reader.ReadElementContentAsInt("PathRadiusOffset", String.Empty);
+        }
+
+        private static void ProcessShpPathRevolutions(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathRevolutions = (byte)reader.ReadElementContentAsInt("PathRevolutions", String.Empty);
+        }
+
+        private static void ProcessShpPathScaleX(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathScaleX = (byte)reader.ReadElementContentAsInt("PathScaleX", String.Empty);
+        }
+
+        private static void ProcessShpPathScaleY(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathScaleY = (byte)reader.ReadElementContentAsInt("PathScaleY", String.Empty);
+        }
+
+        private static void ProcessShpPathShearX(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathShearX = (byte)reader.ReadElementContentAsInt("PathShearX", String.Empty);
+        }
+
+        private static void ProcessShpPathShearY(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathShearY = (byte)reader.ReadElementContentAsInt("PathShearY", String.Empty);
+        }
+
+        private static void ProcessShpPathSkew(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathSkew = (sbyte)reader.ReadElementContentAsInt("PathSkew", String.Empty);
+        }
+
+        private static void ProcessShpPathTaperX(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathTaperX = (sbyte)reader.ReadElementContentAsInt("PathTaperX", String.Empty);
+        }
+
+        private static void ProcessShpPathTaperY(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathTaperY = (sbyte)reader.ReadElementContentAsInt("PathTaperY", String.Empty);
+        }
+
+        private static void ProcessShpPathTwist(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathTwist = (sbyte)reader.ReadElementContentAsInt("PathTwist", String.Empty);
+        }
+
+        private static void ProcessShpPathTwistBegin(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PathTwistBegin = (sbyte)reader.ReadElementContentAsInt("PathTwistBegin", String.Empty);
+        }
+
+        private static void ProcessShpPCode(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.PCode = (byte)reader.ReadElementContentAsInt("PCode", String.Empty);
+        }
+
+        private static void ProcessShpProfileBegin(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.ProfileBegin = (ushort)reader.ReadElementContentAsInt("ProfileBegin", String.Empty);
+        }
+
+        private static void ProcessShpProfileEnd(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.ProfileEnd = (ushort)reader.ReadElementContentAsInt("ProfileEnd", String.Empty);
+        }
+
+        private static void ProcessShpProfileHollow(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.ProfileHollow = (ushort)reader.ReadElementContentAsInt("ProfileHollow", String.Empty);
+        }
+
+        private static void ProcessShpScale(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.Scale = ReadVector(reader, "Scale");
+        }
+
+        private static void ProcessShpState(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.State = (byte)reader.ReadElementContentAsInt("State", String.Empty);
+        }
+
+        private static void ProcessShpProfileShape(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            string value = reader.ReadElementContentAsString("ProfileShape", String.Empty);
+            // !!!!! to deal with flags without commas
+            if (value.Contains(" ") && !value.Contains(","))
+                value = value.Replace(" ", ", ");
+            shp.ProfileShape = (ProfileShape)Enum.Parse(typeof(ProfileShape), value);
+        }
+
+        private static void ProcessShpHollowShape(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            string value = reader.ReadElementContentAsString("HollowShape", String.Empty);
+            // !!!!! to deal with flags without commas
+            if (value.Contains(" ") && !value.Contains(","))
+                value = value.Replace(" ", ", ");
+            shp.HollowShape = (HollowShape)Enum.Parse(typeof(HollowShape), value);
+        }
+        
+        private static void ProcessShpSculptTexture(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.SculptTexture = ReadUUID(reader, "SculptTexture");
+        }
+
+        private static void ProcessShpSculptType(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.SculptType = (byte)reader.ReadElementContentAsInt("SculptType", String.Empty);
+        }
+
+        private static void ProcessShpSculptData(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.SculptData = Convert.FromBase64String(reader.ReadElementString("SculptData"));
+        }
+
+        private static void ProcessShpFlexiSoftness(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.FlexiSoftness = reader.ReadElementContentAsInt("FlexiSoftness", String.Empty);
+        }
+
+        private static void ProcessShpFlexiTension(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.FlexiTension = reader.ReadElementContentAsFloat("FlexiTension", String.Empty);
+        }
+
+        private static void ProcessShpFlexiDrag(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.FlexiDrag = reader.ReadElementContentAsFloat("FlexiDrag", String.Empty);
+        }
+
+        private static void ProcessShpFlexiGravity(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.FlexiGravity = reader.ReadElementContentAsFloat("FlexiGravity", String.Empty);
+        }
+
+        private static void ProcessShpFlexiWind(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.FlexiWind = reader.ReadElementContentAsFloat("FlexiWind", String.Empty);
+        }
+
+        private static void ProcessShpFlexiForceX(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.FlexiForceX = reader.ReadElementContentAsFloat("FlexiForceX", String.Empty);
+        }
+
+        private static void ProcessShpFlexiForceY(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.FlexiForceY = reader.ReadElementContentAsFloat("FlexiForceY", String.Empty);
+        }
+
+        private static void ProcessShpFlexiForceZ(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.FlexiForceZ = reader.ReadElementContentAsFloat("FlexiForceZ", String.Empty);
+        }
+
+        private static void ProcessShpLightColorR(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.LightColorR = reader.ReadElementContentAsFloat("LightColorR", String.Empty);
+        }
+
+        private static void ProcessShpLightColorG(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.LightColorG = reader.ReadElementContentAsFloat("LightColorG", String.Empty);
+        }
+
+        private static void ProcessShpLightColorB(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.LightColorB = reader.ReadElementContentAsFloat("LightColorB", String.Empty);
+        }
+
+        private static void ProcessShpLightColorA(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.LightColorA = reader.ReadElementContentAsFloat("LightColorA", String.Empty);
+        }
+
+        private static void ProcessShpLightRadius(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.LightRadius = reader.ReadElementContentAsFloat("LightRadius", String.Empty);
+        }
+
+        private static void ProcessShpLightCutoff(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.LightCutoff = reader.ReadElementContentAsFloat("LightCutoff", String.Empty);
+        }
+
+        private static void ProcessShpLightFalloff(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.LightFalloff = reader.ReadElementContentAsFloat("LightFalloff", String.Empty);
+        }
+
+        private static void ProcessShpLightIntensity(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.LightIntensity = reader.ReadElementContentAsFloat("LightIntensity", String.Empty);
+        }
+
+        private static void ProcessShpFlexiEntry(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.FlexiEntry = reader.ReadElementContentAsBoolean("FlexiEntry", String.Empty);
+        }
+
+        private static void ProcessShpLightEntry(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.LightEntry = reader.ReadElementContentAsBoolean("LightEntry", String.Empty);
+        }
+
+        private static void ProcessShpSculptEntry(PrimitiveBaseShape shp, XmlTextReader reader)
+        {
+            shp.SculptEntry = reader.ReadElementContentAsBoolean("SculptEntry", String.Empty);
+        }
+
+        #endregion
+
+        ////////// Write /////////
+
+        public static void SOGToXml2(XmlTextWriter writer, SceneObjectGroup sog)
+        {
+            writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty);
+            SOPToXml2(writer, sog.RootPart, null);
+            writer.WriteStartElement(String.Empty, "OtherParts", String.Empty);
+
+            sog.ForEachPart(delegate(SceneObjectPart sop)
+            {
+                SOPToXml2(writer, sop, sog.RootPart);
+            });
+
+            writer.WriteEndElement();
+            writer.WriteEndElement();
+        }
+
+        static void SOPToXml2(XmlTextWriter writer, SceneObjectPart sop, SceneObjectPart parent)
+        {
+            writer.WriteStartElement("SceneObjectPart");
+            writer.WriteAttributeString("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+            writer.WriteAttributeString("xmlns:xsd", "http://www.w3.org/2001/XMLSchema");
+
+            WriteUUID(writer, "CreatorID", sop.CreatorID);
+            WriteUUID(writer, "FolderID", sop.FolderID);
+            writer.WriteElementString("InventorySerial", (sop.Inventory != null) ? sop.InventorySerial.ToString() : "0");
+
+            // FIXME: Task inventory
+            writer.WriteStartElement("TaskInventory"); writer.WriteEndElement();
+
+            writer.WriteElementString("ObjectFlags", ((int)sop.Flags).ToString());
+
+            WriteUUID(writer, "UUID", sop.UUID);
+            writer.WriteElementString("LocalId", sop.LocalId.ToString());
+            writer.WriteElementString("Name", sop.Name);
+            writer.WriteElementString("Material", ((int)sop.Material).ToString());
+            writer.WriteElementString("RegionHandle", sop.RegionHandle.ToString());
+            writer.WriteElementString("ScriptAccessPin", sop.ScriptAccessPin.ToString());
+
+            WriteVector(writer, "GroupPosition", sop.GroupPosition);
+            WriteVector(writer, "OffsetPosition", sop.OffsetPosition);
+
+            WriteQuaternion(writer, "RotationOffset", sop.RotationOffset);
+            WriteVector(writer, "Velocity", sop.Velocity);
+            WriteVector(writer, "RotationalVelocity", Vector3.Zero);
+            WriteVector(writer, "AngularVelocity", sop.AngularVelocity);
+            WriteVector(writer, "Acceleration", sop.Acceleration);
+            writer.WriteElementString("Description", sop.Description);
+            writer.WriteStartElement("Color");
+            writer.WriteElementString("R", sop.Color.R.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("G", sop.Color.G.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("B", sop.Color.B.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("A", sop.Color.G.ToString(Utils.EnUsCulture));
+            writer.WriteEndElement();
+            writer.WriteElementString("Text", sop.Text);
+            writer.WriteElementString("SitName", sop.SitName);
+            writer.WriteElementString("TouchName", sop.TouchName);
+
+            writer.WriteElementString("LinkNum", sop.LinkNum.ToString());
+            writer.WriteElementString("ClickAction", sop.ClickAction.ToString());
+            writer.WriteStartElement("Shape");
+
+            writer.WriteElementString("ProfileCurve", sop.Shape.ProfileCurve.ToString());
+
+            writer.WriteStartElement("TextureEntry");
+            byte[] te;
+            if (sop.Shape.TextureEntry != null)
+                te = sop.Shape.TextureEntry;
+            else
+                te = Utils.EmptyBytes;
+            writer.WriteBase64(te, 0, te.Length);
+            writer.WriteEndElement(); // TextureEntry
+
+            writer.WriteStartElement("ExtraParams");
+            byte[] ep;
+            if (sop.Shape.ExtraParams != null)
+                ep = sop.Shape.ExtraParams;
+            else
+                ep = Utils.EmptyBytes;
+            writer.WriteBase64(ep, 0, ep.Length);
+            writer.WriteEndElement(); // ExtraParams
+
+            writer.WriteElementString("PathBegin", Primitive.PackBeginCut(sop.Shape.PathBegin).ToString());
+            writer.WriteElementString("PathCurve", sop.Shape.PathCurve.ToString());
+            writer.WriteElementString("PathEnd", Primitive.PackEndCut(sop.Shape.PathEnd).ToString());
+            writer.WriteElementString("PathRadiusOffset", Primitive.PackPathTwist(sop.Shape.PathRadiusOffset).ToString());
+            writer.WriteElementString("PathRevolutions", Primitive.PackPathRevolutions(sop.Shape.PathRevolutions).ToString());
+            writer.WriteElementString("PathScaleX", Primitive.PackPathScale(sop.Shape.PathScaleX).ToString());
+            writer.WriteElementString("PathScaleY", Primitive.PackPathScale(sop.Shape.PathScaleY).ToString());
+            writer.WriteElementString("PathShearX", ((byte)Primitive.PackPathShear(sop.Shape.PathShearX)).ToString());
+            writer.WriteElementString("PathShearY", ((byte)Primitive.PackPathShear(sop.Shape.PathShearY)).ToString());
+            writer.WriteElementString("PathSkew", Primitive.PackPathTwist(sop.Shape.PathSkew).ToString());
+            writer.WriteElementString("PathTaperX", Primitive.PackPathTaper(sop.Shape.PathTaperX).ToString());
+            writer.WriteElementString("PathTaperY", Primitive.PackPathTaper(sop.Shape.PathTaperY).ToString());
+            writer.WriteElementString("PathTwist", Primitive.PackPathTwist(sop.Shape.PathTwist).ToString());
+            writer.WriteElementString("PathTwistBegin", Primitive.PackPathTwist(sop.Shape.PathTwistBegin).ToString());
+            writer.WriteElementString("PCode", sop.Shape.PCode.ToString());
+            writer.WriteElementString("ProfileBegin", Primitive.PackBeginCut(sop.Shape.ProfileBegin).ToString());
+            writer.WriteElementString("ProfileEnd", Primitive.PackEndCut(sop.Shape.ProfileEnd).ToString());
+            writer.WriteElementString("ProfileHollow", Primitive.PackProfileHollow(sop.Shape.ProfileHollow).ToString());
+            WriteVector(writer, "Scale", sop.Scale);
+            writer.WriteElementString("State", sop.Shape.State.ToString());
+
+            writer.WriteElementString("ProfileShape", sop.Shape.ProfileShape.ToString());
+            writer.WriteElementString("HollowShape", sop.Shape.HollowShape.ToString());
+
+            writer.WriteElementString("SculptTexture", sop.Shape.SculptTexture.ToString());
+            writer.WriteElementString("SculptType", sop.Shape.SculptType.ToString());
+            writer.WriteStartElement("SculptData");
+            byte[] sd;
+            if (sop.Shape.SculptData != null)
+                sd = sop.Shape.ExtraParams;
+            else
+                sd = Utils.EmptyBytes;
+            writer.WriteBase64(sd, 0, sd.Length);
+            writer.WriteEndElement(); // SculptData
+
+            writer.WriteElementString("FlexiSoftness", sop.Shape.FlexiSoftness.ToString());
+            writer.WriteElementString("FlexiTension", sop.Shape.FlexiTension.ToString());
+            writer.WriteElementString("FlexiDrag", sop.Shape.FlexiDrag.ToString());
+            writer.WriteElementString("FlexiGravity", sop.Shape.FlexiGravity.ToString());
+            writer.WriteElementString("FlexiWind", sop.Shape.FlexiWind.ToString());
+            writer.WriteElementString("FlexiForceX", sop.Shape.FlexiForceX.ToString());
+            writer.WriteElementString("FlexiForceY", sop.Shape.FlexiForceY.ToString());
+            writer.WriteElementString("FlexiForceZ", sop.Shape.FlexiForceZ.ToString());
+
+            writer.WriteElementString("LightColorR", sop.Shape.LightColorR.ToString());
+            writer.WriteElementString("LightColorG", sop.Shape.LightColorG.ToString());
+            writer.WriteElementString("LightColorB", sop.Shape.LightColorB.ToString());
+            writer.WriteElementString("LightColorA", sop.Shape.LightColorA.ToString());
+            writer.WriteElementString("LightRadius", sop.Shape.LightRadius.ToString());
+            writer.WriteElementString("LightCutoff", sop.Shape.LightCutoff.ToString());
+            writer.WriteElementString("LightFalloff", sop.Shape.LightFalloff.ToString());
+            writer.WriteElementString("LightIntensity", sop.Shape.LightIntensity.ToString());
+
+            writer.WriteElementString("FlexyEntry", sop.Shape.FlexiEntry.ToString());
+            writer.WriteElementString("LightEntry", sop.Shape.LightEntry.ToString());
+            writer.WriteElementString("SculptEntry", sop.Shape.SculptEntry.ToString());
+
+            writer.WriteEndElement(); // Shape
+
+            WriteVector(writer, "Scale", sop.Scale);
+            writer.WriteElementString("UpdateFlag", "0");
+            WriteQuaternion(writer, "SitTargetOrientation", sop.SitTargetOrientation); 
+            WriteVector(writer, "SitTargetPosition", sop.SitTargetPosition);
+            WriteVector(writer, "SitTargetPositionLL", sop.SitTargetPositionLL);
+            WriteQuaternion(writer, "SitTargetOrientationLL", sop.SitTargetOrientationLL);
+            writer.WriteElementString("ParentID", sop.ParentID.ToString());
+            writer.WriteElementString("CreationDate", sop.CreationDate.ToString());
+            writer.WriteElementString("Category", "0");
+            writer.WriteElementString("SalePrice", sop.SalePrice.ToString());
+            writer.WriteElementString("ObjectSaleType", ((int)sop.ObjectSaleType).ToString());
+            writer.WriteElementString("OwnershipCost", "0");
+            WriteUUID(writer, "GroupID", sop.GroupID);
+            WriteUUID(writer, "OwnerID", sop.OwnerID);
+            WriteUUID(writer, "LastOwnerID", sop.LastOwnerID);
+            writer.WriteElementString("BaseMask", sop.BaseMask.ToString());
+            writer.WriteElementString("OwnerMask", sop.OwnerMask.ToString());
+            writer.WriteElementString("GroupMask", sop.GroupMask.ToString());
+            writer.WriteElementString("EveryoneMask", sop.EveryoneMask.ToString());
+            writer.WriteElementString("NextOwnerMask", sop.NextOwnerMask.ToString());
+            writer.WriteElementString("Flags", sop.Flags.ToString());
+            WriteUUID(writer, "CollisionSound", sop.CollisionSound);
+            writer.WriteElementString("CollisionSoundVolume", sop.CollisionSoundVolume.ToString());
+
+            writer.WriteEndElement();
+        }
+
+        static void WriteUUID(XmlTextWriter writer, string name, UUID id)
+        {
+            writer.WriteStartElement(name);
+            writer.WriteElementString("UUID", id.ToString());
+            writer.WriteEndElement();
+        }
+
+        static void WriteVector(XmlTextWriter writer, string name, Vector3 vec)
+        {
+            writer.WriteStartElement(name);
+            writer.WriteElementString("X", vec.X.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Y", vec.Y.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Z", vec.Z.ToString(Utils.EnUsCulture));
+            writer.WriteEndElement();
+        }
+
+        static void WriteQuaternion(XmlTextWriter writer, string name, Quaternion quat)
+        {
+            writer.WriteStartElement(name);
+            writer.WriteElementString("X", quat.X.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Y", quat.Y.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Z", quat.Z.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("W", quat.W.ToString(Utils.EnUsCulture));
+            writer.WriteEndElement();
+        }
+
+
+        //////// Read /////////
+        public static bool Xml2ToSOG(XmlTextReader reader, SceneObjectGroup sog)
+        {
+            reader.Read();
+            reader.ReadStartElement("SceneObjectGroup");
+            SceneObjectPart root = Xml2ToSOP(reader);
+            if (root != null)
+                sog.SetRootPart(root);
+            else
+            {
+                return false;
+            }
+
+            if (sog.UUID == UUID.Zero)
+                sog.UUID = sog.RootPart.UUID;
+
+            reader.Read(); // OtherParts
+
+            while (!reader.EOF)
+            {
+                switch (reader.NodeType)
+                {
+                    case XmlNodeType.Element:
+                        if (reader.Name == "SceneObjectPart")
+                        {
+                            SceneObjectPart child = Xml2ToSOP(reader);
+                            if (child != null)
+                                sog.AddPart(child);
+                        }
+                        else
+                        {
+                            //Logger.Log("Found unexpected prim XML element " + reader.Name, Helpers.LogLevel.Debug);
+                            reader.Read();
+                        }
+                        break;
+                    case XmlNodeType.EndElement:
+                    default:
+                        reader.Read();
+                        break;
+                }
+
+            }
+            return true;
+        }
+
+        public static SceneObjectPart Xml2ToSOPPull(XmlTextReader reader)
+        {
+            SceneObjectPart obj = new SceneObjectPart();
+
+            reader.ReadStartElement("SceneObjectPart");
+
+            if (reader.Name == "AllowedDrop")
+                obj.AllowedDrop = reader.ReadElementContentAsBoolean("AllowedDrop", String.Empty);
+            else
+                obj.AllowedDrop = true;
+
+            obj.CreatorID = ReadUUID(reader, "CreatorID");
+            obj.FolderID = ReadUUID(reader, "FolderID");
+            obj.InventorySerial = (uint)reader.ReadElementContentAsInt("InventorySerial", String.Empty);
+
+            #region Task Inventory
+
+            obj.TaskInventory = new TaskInventoryDictionary();
+            //List<PrimObject.InventoryBlock.ItemBlock> invItems = new List<PrimObject.InventoryBlock.ItemBlock>();
+
+            reader.ReadStartElement("TaskInventory", String.Empty);
+            while (reader.Name == "TaskInventoryItem")
+            {
+                TaskInventoryItem item = new TaskInventoryItem();
+                reader.ReadStartElement("TaskInventoryItem", String.Empty);
+
+                item.AssetID = ReadUUID(reader, "AssetID");
+                item.BasePermissions = (uint)reader.ReadElementContentAsInt("BasePermissions", String.Empty);
+                item.CreationDate = (uint)reader.ReadElementContentAsInt("CreationDate", String.Empty);
+                item.CreatorID = ReadUUID(reader, "CreatorID");
+                item.Description = reader.ReadElementContentAsString("Description", String.Empty);
+                item.EveryonePermissions = (uint)reader.ReadElementContentAsInt("EveryonePermissions", String.Empty);
+                item.Flags = (uint)reader.ReadElementContentAsInt("Flags", String.Empty);
+                item.GroupID = ReadUUID(reader, "GroupID");
+                item.GroupPermissions = (uint)reader.ReadElementContentAsInt("GroupPermissions", String.Empty);
+                item.InvType = reader.ReadElementContentAsInt("InvType", String.Empty);
+                item.ItemID = ReadUUID(reader, "ItemID");
+                UUID oldItemID = ReadUUID(reader, "OldItemID"); // TODO: Is this useful?
+                item.LastOwnerID = ReadUUID(reader, "LastOwnerID");
+                item.Name = reader.ReadElementContentAsString("Name", String.Empty);
+                item.NextPermissions = (uint)reader.ReadElementContentAsInt("NextPermissions", String.Empty);
+                item.OwnerID = ReadUUID(reader, "OwnerID");
+                item.CurrentPermissions = (uint)reader.ReadElementContentAsInt("CurrentPermissions", String.Empty);
+                UUID parentID = ReadUUID(reader, "ParentID");
+                UUID parentPartID = ReadUUID(reader, "ParentPartID");
+                item.PermsGranter = ReadUUID(reader, "PermsGranter");
+                item.PermsMask = reader.ReadElementContentAsInt("PermsMask", String.Empty);
+                item.Type = reader.ReadElementContentAsInt("Type", String.Empty);
+
+                reader.ReadEndElement();
+                obj.TaskInventory.Add(item.ItemID, item);
+            }
+            if (reader.NodeType == XmlNodeType.EndElement)
+                reader.ReadEndElement();
+
+            #endregion Task Inventory
+
+            obj.Flags = (PrimFlags)reader.ReadElementContentAsInt("ObjectFlags", String.Empty);
+
+            obj.UUID = ReadUUID(reader, "UUID");
+            obj.LocalId = (uint)reader.ReadElementContentAsLong("LocalId", String.Empty);
+            obj.Name = reader.ReadElementString("Name");
+            obj.Material = (byte)reader.ReadElementContentAsInt("Material", String.Empty);
+
+            if (reader.Name == "PassTouches")
+                obj.PassTouches = reader.ReadElementContentAsBoolean("PassTouches", String.Empty);
+            else
+                obj.PassTouches = false;
+
+            obj.RegionHandle = (ulong)reader.ReadElementContentAsLong("RegionHandle", String.Empty);
+            obj.ScriptAccessPin = reader.ReadElementContentAsInt("ScriptAccessPin", String.Empty);
+
+            if (reader.Name == "PlaySoundSlavePrims")
+                reader.ReadInnerXml();
+            if (reader.Name == "LoopSoundSlavePrims")
+                reader.ReadInnerXml();
+
+            Vector3 groupPosition = ReadVector(reader, "GroupPosition");
+            Vector3 offsetPosition = ReadVector(reader, "OffsetPosition");
+            obj.RotationOffset = ReadQuaternion(reader, "RotationOffset");
+            obj.Velocity = ReadVector(reader, "Velocity");
+            if (reader.Name == "RotationalVelocity")
+                ReadVector(reader, "RotationalVelocity");
+            obj.AngularVelocity = ReadVector(reader, "AngularVelocity");
+            obj.Acceleration = ReadVector(reader, "Acceleration");
+            obj.Description = reader.ReadElementString("Description");
+            reader.ReadStartElement("Color");
+            if (reader.Name == "R")
+            {
+                obj.Color = Color.FromArgb((int)reader.ReadElementContentAsFloat("A", String.Empty),
+                        (int)reader.ReadElementContentAsFloat("R", String.Empty),
+                        (int)reader.ReadElementContentAsFloat("G", String.Empty),
+                        (int)reader.ReadElementContentAsFloat("B", String.Empty));
+                reader.ReadEndElement();
+            }
+            obj.Text = reader.ReadElementString("Text", String.Empty);
+            obj.SitName = reader.ReadElementString("SitName", String.Empty);
+            obj.TouchName = reader.ReadElementString("TouchName", String.Empty);
+
+            obj.LinkNum = reader.ReadElementContentAsInt("LinkNum", String.Empty);
+            obj.ClickAction = (byte)reader.ReadElementContentAsInt("ClickAction", String.Empty);
+
+            reader.ReadStartElement("Shape");
+            obj.Shape.ProfileCurve = (byte)reader.ReadElementContentAsInt("ProfileCurve", String.Empty);
+
+            byte[] teData = Convert.FromBase64String(reader.ReadElementString("TextureEntry"));
+            obj.Shape.Textures = new Primitive.TextureEntry(teData, 0, teData.Length);
+
+            reader.ReadInnerXml(); // ExtraParams
+
+            obj.Shape.PathBegin = (ushort)reader.ReadElementContentAsInt("PathBegin", String.Empty);
+            obj.Shape.PathCurve = (byte)reader.ReadElementContentAsInt("PathCurve", String.Empty);
+            obj.Shape.PathEnd = (ushort)reader.ReadElementContentAsInt("PathEnd", String.Empty);
+            obj.Shape.PathRadiusOffset = (sbyte)reader.ReadElementContentAsInt("PathRadiusOffset", String.Empty);
+            obj.Shape.PathRevolutions = (byte)reader.ReadElementContentAsInt("PathRevolutions", String.Empty);
+            obj.Shape.PathScaleX = (byte)reader.ReadElementContentAsInt("PathScaleX", String.Empty);
+            obj.Shape.PathScaleY = (byte)reader.ReadElementContentAsInt("PathScaleY", String.Empty);
+            obj.Shape.PathShearX = (byte)reader.ReadElementContentAsInt("PathShearX", String.Empty);
+            obj.Shape.PathShearY = (byte)reader.ReadElementContentAsInt("PathShearY", String.Empty);
+            obj.Shape.PathSkew = (sbyte)reader.ReadElementContentAsInt("PathSkew", String.Empty);
+            obj.Shape.PathTaperX = (sbyte)reader.ReadElementContentAsInt("PathTaperX", String.Empty);
+            obj.Shape.PathTaperY = (sbyte)reader.ReadElementContentAsInt("PathTaperY", String.Empty);
+            obj.Shape.PathTwist = (sbyte)reader.ReadElementContentAsInt("PathTwist", String.Empty);
+            obj.Shape.PathTwistBegin = (sbyte)reader.ReadElementContentAsInt("PathTwistBegin", String.Empty);
+            obj.Shape.PCode = (byte)reader.ReadElementContentAsInt("PCode", String.Empty);
+            obj.Shape.ProfileBegin = (ushort)reader.ReadElementContentAsInt("ProfileBegin", String.Empty);
+            obj.Shape.ProfileEnd = (ushort)reader.ReadElementContentAsInt("ProfileEnd", String.Empty);
+            obj.Shape.ProfileHollow = (ushort)reader.ReadElementContentAsInt("ProfileHollow", String.Empty);
+            obj.Scale = ReadVector(reader, "Scale");
+            obj.Shape.State = (byte)reader.ReadElementContentAsInt("State", String.Empty);
+
+            obj.Shape.ProfileCurve = (byte)reader.ReadElementContentAsInt("ProfileCurve", String.Empty);
+            obj.Shape.ProfileShape = (ProfileShape)reader.ReadElementContentAsInt("ProfileShape", String.Empty);
+            obj.Shape.HollowShape = (HollowShape)reader.ReadElementContentAsInt("HollowShape", String.Empty);
+
+            UUID sculptTexture = ReadUUID(reader, "SculptTexture");
+            SculptType sculptType = (SculptType)reader.ReadElementContentAsInt("SculptType", String.Empty);
+            if (sculptTexture != UUID.Zero)
+            {
+                obj.Shape.SculptTexture = sculptTexture;
+                obj.Shape.SculptType = (byte)sculptType;
+            }
+
+            reader.ReadInnerXml(); // SculptData
+
+            obj.Shape.FlexiSoftness = reader.ReadElementContentAsInt("FlexiSoftness", String.Empty);
+            obj.Shape.FlexiTension = reader.ReadElementContentAsFloat("FlexiTension", String.Empty);
+            obj.Shape.FlexiDrag = reader.ReadElementContentAsFloat("FlexiDrag", String.Empty);
+            obj.Shape.FlexiGravity = reader.ReadElementContentAsFloat("FlexiGravity", String.Empty);
+            obj.Shape.FlexiWind = reader.ReadElementContentAsFloat("FlexiWind", String.Empty);
+            obj.Shape.FlexiForceX = reader.ReadElementContentAsFloat("FlexiForceX", String.Empty);
+            obj.Shape.FlexiForceY = reader.ReadElementContentAsFloat("FlexiForceY", String.Empty);
+            obj.Shape.FlexiForceZ = reader.ReadElementContentAsFloat("FlexiForceZ", String.Empty);
+
+            obj.Shape.LightColorR = reader.ReadElementContentAsFloat("LightColorR", String.Empty);
+            obj.Shape.LightColorG = reader.ReadElementContentAsFloat("LightColorG", String.Empty);
+            obj.Shape.LightColorB = reader.ReadElementContentAsFloat("LightColorB", String.Empty);
+            obj.Shape.LightColorA = reader.ReadElementContentAsFloat("LightColorA", String.Empty);
+            obj.Shape.LightRadius = reader.ReadElementContentAsFloat("LightRadius", String.Empty);
+            obj.Shape.LightCutoff = reader.ReadElementContentAsFloat("LightCutoff", String.Empty);
+            obj.Shape.LightFalloff = reader.ReadElementContentAsFloat("LightFalloff", String.Empty);
+            obj.Shape.LightIntensity = reader.ReadElementContentAsFloat("LightIntensity", String.Empty);
+
+            bool hasFlexi = reader.ReadElementContentAsBoolean("FlexiEntry", String.Empty);
+            bool hasLight = reader.ReadElementContentAsBoolean("LightEntry", String.Empty);
+            reader.ReadInnerXml(); // SculptEntry
+
+            reader.ReadEndElement();
+
+            obj.Scale = ReadVector(reader, "Scale"); // Yes, again
+            obj.UpdateFlag =  (byte)reader.ReadElementContentAsInt("UpdateFlag", String.Empty); // UpdateFlag
+
+            obj.SitTargetOrientation = ReadQuaternion(reader, "SitTargetOrientation");
+            obj.SitTargetPosition = ReadVector(reader, "SitTargetPosition");
+            obj.SitTargetPositionLL = ReadVector(reader, "SitTargetPositionLL");
+            obj.SitTargetOrientationLL = ReadQuaternion(reader, "SitTargetOrientationLL");
+            obj.ParentID = (uint)reader.ReadElementContentAsLong("ParentID", String.Empty);
+            obj.CreationDate = reader.ReadElementContentAsInt("CreationDate", String.Empty);
+            int category = reader.ReadElementContentAsInt("Category", String.Empty);
+            obj.SalePrice = reader.ReadElementContentAsInt("SalePrice", String.Empty);
+            obj.ObjectSaleType = (byte)reader.ReadElementContentAsInt("ObjectSaleType", String.Empty);
+            int ownershipCost = reader.ReadElementContentAsInt("OwnershipCost", String.Empty);
+            obj.GroupID = ReadUUID(reader, "GroupID");
+            obj.OwnerID = ReadUUID(reader, "OwnerID");
+            obj.LastOwnerID = ReadUUID(reader, "LastOwnerID");
+            obj.BaseMask = (uint)reader.ReadElementContentAsInt("BaseMask", String.Empty);
+            obj.OwnerMask = (uint)reader.ReadElementContentAsInt("OwnerMask", String.Empty);
+            obj.GroupMask = (uint)reader.ReadElementContentAsInt("GroupMask", String.Empty);
+            obj.EveryoneMask = (uint)reader.ReadElementContentAsInt("EveryoneMask", String.Empty);
+            obj.NextOwnerMask = (uint)reader.ReadElementContentAsInt("NextOwnerMask", String.Empty);
+
+            obj.Flags = (PrimFlags)reader.ReadElementContentAsInt("Flags", String.Empty);
+
+            obj.CollisionSound = ReadUUID(reader, "CollisionSound");
+            obj.CollisionSoundVolume = reader.ReadElementContentAsFloat("CollisionSoundVolume", String.Empty);
+
+            reader.ReadEndElement();
+
+            obj.GroupPosition = groupPosition;
+            obj.OffsetPosition = offsetPosition;
+
+            return obj;
+        }
+
+        public static SceneObjectPart Xml2ToSOP(XmlTextReader reader)
+        {
+            SceneObjectPart obj = new SceneObjectPart();
+
+            reader.ReadStartElement("SceneObjectPart");
+
+            string nodeName = string.Empty;
+            while (reader.NodeType != XmlNodeType.EndElement)
+            {
+                nodeName = reader.Name;
+                SOPXmlProcessor p = null;
+                if (m_SOPXmlProcessors.TryGetValue(reader.Name, out p))
+                {
+                    try
+                    {
+                        p(obj, reader);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.DebugFormat("[SceneObjectSerializer]: exception while parsing {0} in {1}-{2}: {3}", nodeName, obj.Name, obj.UUID, e);
+                    }
+                }
+                else
+                {
+                    m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element {0}", nodeName);
+                    reader.ReadOuterXml(); // ignore
+                }
+
+            }
+
+            reader.ReadEndElement(); // SceneObjectPart
+
+            //m_log.DebugFormat("[XXX]: parsed SOP {0} - {1}", obj.Name, obj.UUID);
+            return obj;
+        }
+
+        static UUID ReadUUID(XmlTextReader reader, string name)
+        {
+            UUID id;
+            string idStr;
+
+            reader.ReadStartElement(name);
+
+            if (reader.Name == "Guid")
+                idStr = reader.ReadElementString("Guid");
+            else // UUID
+                idStr = reader.ReadElementString("UUID");
+
+            UUID.TryParse(idStr, out id);
+            reader.ReadEndElement();
+
+            return id;
+        }
+
+        static Vector3 ReadVector(XmlTextReader reader, string name)
+        {
+            Vector3 vec;
+
+            reader.ReadStartElement(name);
+            vec.X = reader.ReadElementContentAsFloat("X", String.Empty);
+            vec.Y = reader.ReadElementContentAsFloat("Y", String.Empty);
+            vec.Z = reader.ReadElementContentAsFloat("Z", String.Empty);
+            reader.ReadEndElement();
+
+            return vec;
+        }
+
+        static Quaternion ReadQuaternion(XmlTextReader reader, string name)
+        {
+            Quaternion quat;
+
+            reader.ReadStartElement(name);
+            quat.X = reader.ReadElementContentAsFloat("X", String.Empty);
+            quat.Y = reader.ReadElementContentAsFloat("Y", String.Empty);
+            quat.Z = reader.ReadElementContentAsFloat("Z", String.Empty);
+            quat.W = reader.ReadElementContentAsFloat("W", String.Empty);
+            reader.ReadEndElement();
+
+            return quat;
+        }
+
+        static TaskInventoryDictionary ReadTaskInventory(XmlTextReader reader, string name)
+        {
+            TaskInventoryDictionary tinv = new TaskInventoryDictionary();
+
+            reader.ReadStartElement(name, String.Empty);
+
+            while (reader.Name == "TaskInventoryItem")
+            {
+                reader.ReadStartElement("TaskInventoryItem", String.Empty); // TaskInventory
+
+                TaskInventoryItem item = new TaskInventoryItem();
+                while (reader.NodeType != XmlNodeType.EndElement)
+                {
+                    TaskInventoryXmlProcessor p = null;
+                    if (m_TaskInventoryXmlProcessors.TryGetValue(reader.Name, out p))
+                        p(item, reader);
+                    else
+                    {
+                        m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in TaskInventory {0}, {1}", reader.Name, reader.Value);
+                        reader.ReadOuterXml();
+                    }
+                }
+                reader.ReadEndElement(); // TaskInventoryItem
+                tinv.Add(item.ItemID, item);
+
+            }
+
+            if (reader.NodeType == XmlNodeType.EndElement)
+                reader.ReadEndElement(); // TaskInventory
+
+            return tinv;
+        }
+
+        static PrimitiveBaseShape ReadShape(XmlTextReader reader, string name)
+        {
+            PrimitiveBaseShape shape = new PrimitiveBaseShape();
+
+            reader.ReadStartElement(name, String.Empty); // Shape
+
+            while (reader.NodeType != XmlNodeType.EndElement)
+            {
+                ShapeXmlProcessor p = null;
+                if (m_ShapeXmlProcessors.TryGetValue(reader.Name, out p))
+                    p(shape, reader);
+                else
+                {
+                    m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in Shape {0}", reader.Name);
+                    reader.ReadOuterXml();
+                }
+            }
+
+            reader.ReadEndElement(); // Shape
+
+            return shape;
+        }
+
+        #endregion
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
index 5494549..bb67ca0 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -124,14 +124,30 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 foreach (XmlNode aPrimNode in rootNode.ChildNodes)
                 {
                     // There is only ever one prim.  This oddity should be removeable post 0.5.9
-                    return SceneObjectSerializer.FromXml2Format(aPrimNode.OuterXml);
+                    //return SceneObjectSerializer.FromXml2Format(aPrimNode.OuterXml);
+                    using (reader = new XmlTextReader(new StringReader(aPrimNode.OuterXml)))
+                    {
+                        SceneObjectGroup obj = new SceneObjectGroup();
+                        if (SceneObjectSerializer.Xml2ToSOG(reader, obj))
+                            return obj;
+
+                        return null;
+                    }
                 }
 
                 return null;
             }
             else
             {
-                return SceneObjectSerializer.FromXml2Format(rootNode.OuterXml);
+                //return SceneObjectSerializer.FromXml2Format(rootNode.OuterXml);
+                using (reader = new XmlTextReader(new StringReader(rootNode.OuterXml)))
+                {
+                    SceneObjectGroup obj = new SceneObjectGroup();
+                    if (SceneObjectSerializer.Xml2ToSOG(reader, obj))
+                        return obj;
+
+                    return null;
+                }
             }
         }
 
@@ -193,12 +209,17 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         /// <returns>The scene object created.  null if the scene object already existed</returns>
         protected static SceneObjectGroup CreatePrimFromXml2(Scene scene, string xmlData)
         {
-            SceneObjectGroup obj = SceneObjectSerializer.FromXml2Format(xmlData);
+            //SceneObjectGroup obj = SceneObjectSerializer.FromXml2Format(xmlData);
+            using (XmlTextReader reader = new XmlTextReader(new StringReader(xmlData)))
+            {
+                SceneObjectGroup obj = new SceneObjectGroup();
+                SceneObjectSerializer.Xml2ToSOG(reader, obj);
 
-            if (scene.AddRestoredSceneObject(obj, true, false))
-                return obj;
-            else
-                return null;
+                if (scene.AddRestoredSceneObject(obj, true, false))
+                    return obj;
+                else
+                    return null;
+            }
         }
 
         public static void SavePrimsToXml2(Scene scene, string fileName)