From 6f73835ea8d4800a51cae9e1c04de602c785f6de Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Tue, 5 Dec 2006 02:28:59 +0000 Subject: [PATCH] Removing code that set empty namespaces on the xml output, this may fix the List deserialization issue git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@681 52acb1d6-8a22-11de-b505-999d5b087335 --- libsecondlife-cs/Helpers.cs | 12 ++++++------ libsecondlife-cs/Prims.cs | 6 +++--- libsecondlife-cs/SerializableDictionary.cs | 8 ++++---- libsecondlife-cs/_Packets_.cs | 6 +++--- libsecondlife-cs/mapgenerator/mapgenerator.cs | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libsecondlife-cs/Helpers.cs b/libsecondlife-cs/Helpers.cs index 65497879..207a6505 100644 --- a/libsecondlife-cs/Helpers.cs +++ b/libsecondlife-cs/Helpers.cs @@ -533,18 +533,18 @@ namespace libsecondlife public static void PacketListToXml(List packets, XmlWriter xmlWriter) { - XmlSerializerNamespaces ns = new XmlSerializerNamespaces(); - ns.Add("", ""); + //XmlSerializerNamespaces ns = new XmlSerializerNamespaces(); + //ns.Add("", ""); XmlSerializer serializer = new XmlSerializer(typeof(List)); - serializer.Serialize(xmlWriter, packets, ns); + serializer.Serialize(xmlWriter, packets); } public static void PrimListToXml(List list, XmlWriter xmlWriter) { - XmlSerializerNamespaces ns = new XmlSerializerNamespaces(); - ns.Add("", ""); + //XmlSerializerNamespaces ns = new XmlSerializerNamespaces(); + //ns.Add("", ""); XmlSerializer serializer = new XmlSerializer(typeof(List)); - serializer.Serialize(xmlWriter, list, ns); + serializer.Serialize(xmlWriter, list); } public static List PrimListFromXml(XmlReader reader) diff --git a/libsecondlife-cs/Prims.cs b/libsecondlife-cs/Prims.cs index 57b5e800..550cf6da 100644 --- a/libsecondlife-cs/Prims.cs +++ b/libsecondlife-cs/Prims.cs @@ -471,10 +471,10 @@ namespace libsecondlife public void ToXml(XmlWriter xmlWriter) { - XmlSerializerNamespaces ns = new XmlSerializerNamespaces(); - ns.Add("", ""); + //XmlSerializerNamespaces ns = new XmlSerializerNamespaces(); + //ns.Add("", ""); XmlSerializer serializer = new XmlSerializer(typeof(PrimObject)); - serializer.Serialize(xmlWriter, this, ns); + serializer.Serialize(xmlWriter, this); } public static PrimObject FromXml(XmlReader xmlReader) diff --git a/libsecondlife-cs/SerializableDictionary.cs b/libsecondlife-cs/SerializableDictionary.cs index 8ed723cf..73f6a502 100644 --- a/libsecondlife-cs/SerializableDictionary.cs +++ b/libsecondlife-cs/SerializableDictionary.cs @@ -93,20 +93,20 @@ namespace libsecondlife { XmlSerializer keySerializer = new XmlSerializer(typeof(TKey)); XmlSerializer valueSerializer = new XmlSerializer(typeof(TValue)); - XmlSerializerNamespaces ns = new XmlSerializerNamespaces(); - ns.Add("", ""); + //XmlSerializerNamespaces ns = new XmlSerializerNamespaces(); + //ns.Add("", ""); foreach (TKey key in this.Keys) { writer.WriteStartElement("item"); writer.WriteStartElement("key"); - keySerializer.Serialize(writer, key, ns); + keySerializer.Serialize(writer, key); writer.WriteEndElement(); writer.WriteStartElement("value"); TValue value = this[key]; - valueSerializer.Serialize(writer, value, ns); + valueSerializer.Serialize(writer, value); writer.WriteEndElement(); writer.WriteEndElement(); } diff --git a/libsecondlife-cs/_Packets_.cs b/libsecondlife-cs/_Packets_.cs index 6e329266..b2a81c01 100644 --- a/libsecondlife-cs/_Packets_.cs +++ b/libsecondlife-cs/_Packets_.cs @@ -1477,10 +1477,10 @@ namespace libsecondlife.Packets public void ToXml(XmlWriter xmlWriter) { - XmlSerializerNamespaces ns = new XmlSerializerNamespaces(); - ns.Add("", ""); + //XmlSerializerNamespaces ns = new XmlSerializerNamespaces(); + //ns.Add("", ""); XmlSerializer serializer = new XmlSerializer(typeof(Packet)); - serializer.Serialize(xmlWriter, this, ns); + serializer.Serialize(xmlWriter, this); } public static PacketType GetType(ushort id, PacketFrequency frequency) { diff --git a/libsecondlife-cs/mapgenerator/mapgenerator.cs b/libsecondlife-cs/mapgenerator/mapgenerator.cs index 8550a854..6df8ac1f 100644 --- a/libsecondlife-cs/mapgenerator/mapgenerator.cs +++ b/libsecondlife-cs/mapgenerator/mapgenerator.cs @@ -806,10 +806,10 @@ namespace mapgenerator " public abstract byte[] ToBytes();" + Environment.NewLine + Environment.NewLine + " public void ToXml(XmlWriter xmlWriter)" + Environment.NewLine + " {" + Environment.NewLine + - " XmlSerializerNamespaces ns = new XmlSerializerNamespaces();" + Environment.NewLine + - " ns.Add(\"\", \"\");" + Environment.NewLine + + //" XmlSerializerNamespaces ns = new XmlSerializerNamespaces();" + Environment.NewLine + + //" ns.Add(\"\", \"\");" + Environment.NewLine + " XmlSerializer serializer = new XmlSerializer(typeof(Packet));" + Environment.NewLine + - " serializer.Serialize(xmlWriter, this, ns);" + Environment.NewLine + + " serializer.Serialize(xmlWriter, this);" + Environment.NewLine + " }" + Environment.NewLine + " public static PacketType GetType(ushort id, PacketFrequency frequency)" + Environment.NewLine + " {" + Environment.NewLine +