aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
diff options
context:
space:
mode:
authorUbitUmarov2018-01-17 04:18:43 +0000
committerUbitUmarov2018-01-17 04:18:43 +0000
commit029d6e40f675387e42ca575ba467dea95cddb3dc (patch)
tree5759ca9c58c5dbfe51d68ac8c5d1b1bc7be5d549 /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
parentupdate DotNetOpenId (.net4.6) (diff)
downloadopensim-SC-029d6e40f675387e42ca575ba467dea95cddb3dc.zip
opensim-SC-029d6e40f675387e42ca575ba467dea95cddb3dc.tar.gz
opensim-SC-029d6e40f675387e42ca575ba467dea95cddb3dc.tar.bz2
opensim-SC-029d6e40f675387e42ca575ba467dea95cddb3dc.tar.xz
remove those xml things no longer needed on .net >4.5.2
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs6
1 files changed, 1 insertions, 5 deletions
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