diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
3 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs index abcb573..a93782e 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | |||
@@ -133,8 +133,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
133 | { | 133 | { |
134 | using (XmlTextReader reader = new XmlTextReader(sr)) | 134 | using (XmlTextReader reader = new XmlTextReader(sr)) |
135 | { | 135 | { |
136 | reader.ProhibitDtd = true; | ||
137 | |||
138 | reader.MoveToContent(); // skip possible xml declaration | 136 | reader.MoveToContent(); // skip possible xml declaration |
139 | 137 | ||
140 | if (reader.Name != "CoalescedObject") | 138 | if (reader.Name != "CoalescedObject") |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 9a20706..1196c28 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
63 | String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData); | 63 | String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData); |
64 | using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null)) | 64 | using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null)) |
65 | { | 65 | { |
66 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true })) | 66 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment})) |
67 | { | 67 | { |
68 | try | 68 | try |
69 | { | 69 | { |
@@ -271,11 +271,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
271 | using(StringReader sr = new StringReader(parts[0].OuterXml)) | 271 | using(StringReader sr = new StringReader(parts[0].OuterXml)) |
272 | { | 272 | { |
273 | using(XmlTextReader reader = new XmlTextReader(sr)) | 273 | using(XmlTextReader reader = new XmlTextReader(sr)) |
274 | { | ||
275 | reader.ProhibitDtd = true; | ||
276 | |||
277 | sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader)); | 274 | sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader)); |
278 | } | ||
279 | } | 275 | } |
280 | 276 | ||
281 | // Then deal with the rest | 277 | // Then deal with the rest |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs index 0ebc645..09e3f9c 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | |||
@@ -57,7 +57,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
57 | using(XmlTextReader reader = new XmlTextReader(fileName)) | 57 | using(XmlTextReader reader = new XmlTextReader(fileName)) |
58 | { | 58 | { |
59 | reader.WhitespaceHandling = WhitespaceHandling.None; | 59 | reader.WhitespaceHandling = WhitespaceHandling.None; |
60 | reader.ProhibitDtd = true; | ||
61 | 60 | ||
62 | doc.Load(reader); | 61 | doc.Load(reader); |
63 | } | 62 | } |