From 1b75ec5647afeb9fbdad78f70c0c90a829bba076 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 29 Aug 2014 19:08:23 +0100
Subject: Ignore whitespace when reading serialized XML objects.

This was previously effectively being done by XmlDocument in the multiple passes through the XML.
This change tells XmlReader to ignore whitespace.  This also means changing arguments to use XmlReader instead of XmlTextReader (a descendent of XmlReader) directly.
XmlReader.Create() has been the recommend way to create XML readers since .NET 2.0 as per MS SDK and is the only way to specific ignore whitespace settings.
---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 77 +++++++++++-----------
 1 file changed, 40 insertions(+), 37 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index cbb4fe7..3489873 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2214,49 +2214,52 @@ namespace OpenSim.Region.Framework.Scenes
 
             try
             {
-                using (XmlTextReader reader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
+                using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
                 {
-                    reader.Read();
-                    bool isSingleObject = reader.Name != "CoalescedObject";
-
-                    if (isSingleObject || isAttachment)
+                    using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment }))
                     {
-                        SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(reader);
-                        objlist.Add(g);
-                        veclist.Add(Vector3.Zero);
-                        bbox = g.GetAxisAlignedBoundingBox(out offsetHeight);
-                        return true;
-                    }
-                    else
-                    {                
-                        XmlDocument doc = new XmlDocument();
-                        doc.LoadXml(xmlData);
-                        XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
-                        XmlElement coll = (XmlElement)e;
-                        float bx = Convert.ToSingle(coll.GetAttribute("x"));
-                        float by = Convert.ToSingle(coll.GetAttribute("y"));
-                        float bz = Convert.ToSingle(coll.GetAttribute("z"));
-                        bbox = new Vector3(bx, by, bz);
-                        offsetHeight = 0;
-
-                        XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
-                        foreach (XmlNode n in groups)
+                        reader.Read();
+                        bool isSingleObject = reader.Name != "CoalescedObject";
+
+                        if (isSingleObject || isAttachment)
                         {
-                            SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
+                            SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(reader);
                             objlist.Add(g);
-
-                            XmlElement el = (XmlElement)n;
-                            string rawX = el.GetAttribute("offsetx");
-                            string rawY = el.GetAttribute("offsety");
-                            string rawZ = el.GetAttribute("offsetz");
-
-                            float x = Convert.ToSingle(rawX);
-                            float y = Convert.ToSingle(rawY);
-                            float z = Convert.ToSingle(rawZ);
-                            veclist.Add(new Vector3(x, y, z));
+                            veclist.Add(Vector3.Zero);
+                            bbox = g.GetAxisAlignedBoundingBox(out offsetHeight);
+                            return true;
                         }
+                        else
+                        {                
+                            XmlDocument doc = new XmlDocument();
+                            doc.LoadXml(xmlData);
+                            XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
+                            XmlElement coll = (XmlElement)e;
+                            float bx = Convert.ToSingle(coll.GetAttribute("x"));
+                            float by = Convert.ToSingle(coll.GetAttribute("y"));
+                            float bz = Convert.ToSingle(coll.GetAttribute("z"));
+                            bbox = new Vector3(bx, by, bz);
+                            offsetHeight = 0;
+
+                            XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
+                            foreach (XmlNode n in groups)
+                            {
+                                SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
+                                objlist.Add(g);
+
+                                XmlElement el = (XmlElement)n;
+                                string rawX = el.GetAttribute("offsetx");
+                                string rawY = el.GetAttribute("offsety");
+                                string rawZ = el.GetAttribute("offsetz");
+
+                                float x = Convert.ToSingle(rawX);
+                                float y = Convert.ToSingle(rawY);
+                                float z = Convert.ToSingle(rawZ);
+                                veclist.Add(new Vector3(x, y, z));
+                            }
 
-                        return false;
+                            return false;
+                        }
                     }
                 }
             }
-- 
cgit v1.1