OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

missed a few..

0.9.0.1-postfixes
UbitUmarov 2018-01-09 19:48:13 +00:00
parent e908c0ecad
commit 439cbf0d4d
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
View File

@ -134,7 +134,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
using (XmlTextReader reader = new XmlTextReader(sr)) using (XmlTextReader reader = new XmlTextReader(sr))
{ {
reader.ProhibitDtd = true; reader.ProhibitDtd = true;
reader.XmlResolver = null;
reader.MoveToContent(); // skip possible xml declaration reader.MoveToContent(); // skip possible xml declaration

3
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData); String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData);
using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null)) using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null))
{ {
using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true, XmlResolver = null })) using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true }))
{ {
try try
{ {
@ -273,7 +273,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
using(XmlTextReader reader = new XmlTextReader(sr)) using(XmlTextReader reader = new XmlTextReader(sr))
{ {
reader.ProhibitDtd = true; reader.ProhibitDtd = true;
reader.XmlResolver = null;
sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader)); sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
} }

1
OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
View File

@ -58,7 +58,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
{ {
reader.WhitespaceHandling = WhitespaceHandling.None; reader.WhitespaceHandling = WhitespaceHandling.None;
reader.ProhibitDtd = true; reader.ProhibitDtd = true;
reader.XmlResolver = null;
doc.Load(reader); doc.Load(reader);
} }