From 22eff055d4c03d2bb0bd44f4259a280761d90715 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 17 Oct 2010 10:35:38 -0700
Subject: .NET automagical serialization of SOPs replaced by manual
serialization across the board.
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 39b109b..bf4c55c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -39,6 +39,7 @@ using OpenMetaverse.Packets;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes.Scripting;
+using OpenSim.Region.Framework.Scenes.Serialization;
using OpenSim.Region.Physics.Manager;
namespace OpenSim.Region.Framework.Scenes
@@ -124,10 +125,6 @@ namespace OpenSim.Region.Framework.Scenes
get { return ParentGroup.RootPart == this; }
}
- // use only one serializer to give the runtime a chance to optimize it (it won't do that if you
- // use a new instance every time)
- private static XmlSerializer serializer = new XmlSerializer(typeof (SceneObjectPart));
-
#region Fields
public bool AllowedDrop;
@@ -1850,7 +1847,7 @@ namespace OpenSim.Region.Framework.Scenes
///
///
///
- public static SceneObjectPart FromXml(XmlReader xmlReader)
+ public static SceneObjectPart FromXml(XmlTextReader xmlReader)
{
return FromXml(UUID.Zero, xmlReader);
}
@@ -1861,9 +1858,9 @@ namespace OpenSim.Region.Framework.Scenes
/// The inventory id from which this part came, if applicable
///
///
- public static SceneObjectPart FromXml(UUID fromUserInventoryItemId, XmlReader xmlReader)
+ public static SceneObjectPart FromXml(UUID fromUserInventoryItemId, XmlTextReader xmlReader)
{
- SceneObjectPart part = (SceneObjectPart)serializer.Deserialize(xmlReader);
+ SceneObjectPart part = SceneObjectSerializer.Xml2ToSOP(xmlReader);
part.m_fromUserInventoryItemID = fromUserInventoryItemId;
// for tempOnRez objects, we have to fix the Expire date.
@@ -4058,9 +4055,9 @@ namespace OpenSim.Region.Framework.Scenes
/// Serialize this part to xml.
///
///
- public void ToXml(XmlWriter xmlWriter)
+ public void ToXml(XmlTextWriter xmlWriter)
{
- serializer.Serialize(xmlWriter, this);
+ SceneObjectSerializer.SOPToXml2(xmlWriter, this, new Dictionary());
}
public void TriggerScriptChangedEvent(Changed val)
--
cgit v1.1