diff options
author | UbitUmarov | 2018-01-08 12:00:21 +0000 |
---|---|---|
committer | UbitUmarov | 2018-01-08 12:00:21 +0000 |
commit | eec3921800e3a19f210c0488d78399c210f9b9d6 (patch) | |
tree | 9d1f1dfc98e518e060b5d172891051edae8c9561 /OpenSim/Framework/Serialization/External | |
parent | a few more xml things (diff) | |
download | opensim-SC_OLD-eec3921800e3a19f210c0488d78399c210f9b9d6.zip opensim-SC_OLD-eec3921800e3a19f210c0488d78399c210f9b9d6.tar.gz opensim-SC_OLD-eec3921800e3a19f210c0488d78399c210f9b9d6.tar.bz2 opensim-SC_OLD-eec3921800e3a19f210c0488d78399c210f9b9d6.tar.xz |
fall back to a obsolete property since several monos in use (include our own) do not suporte the proper .net4.0 one
Diffstat (limited to 'OpenSim/Framework/Serialization/External')
4 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs index da877a7..2d4bdbc 100644 --- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs +++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs | |||
@@ -221,7 +221,7 @@ namespace OpenSim.Framework.Serialization.External | |||
221 | using (StringWriter sw = new StringWriter()) | 221 | using (StringWriter sw = new StringWriter()) |
222 | using (XmlTextWriter writer = new XmlTextWriter(sw)) | 222 | using (XmlTextWriter writer = new XmlTextWriter(sw)) |
223 | using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null)) | 223 | using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null)) |
224 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null })) | 224 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true, XmlResolver = null })) |
225 | { | 225 | { |
226 | TransformXml(reader, writer, sceneName, homeURL, userService, scopeID); | 226 | TransformXml(reader, writer, sceneName, homeURL, userService, scopeID); |
227 | 227 | ||
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs index d323f45..7e17bc0 100644 --- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs +++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs | |||
@@ -178,7 +178,7 @@ namespace OpenSim.Framework.Serialization.External | |||
178 | 178 | ||
179 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData))) | 179 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData))) |
180 | { | 180 | { |
181 | reader.DtdProcessing = DtdProcessing.Prohibit; | 181 | reader.ProhibitDtd = true; |
182 | reader.XmlResolver = null; | 182 | reader.XmlResolver = null; |
183 | reader.ReadStartElement("LandData"); | 183 | reader.ReadStartElement("LandData"); |
184 | 184 | ||
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs index fb4f904..6ff5687 100644 --- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs +++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Framework.Serialization.External | |||
63 | 63 | ||
64 | StringReader sr = new StringReader(serializedSettings); | 64 | StringReader sr = new StringReader(serializedSettings); |
65 | XmlTextReader xtr = new XmlTextReader(sr); | 65 | XmlTextReader xtr = new XmlTextReader(sr); |
66 | xtr.DtdProcessing = DtdProcessing.Prohibit; | 66 | xtr.ProhibitDtd = true; |
67 | xtr.XmlResolver = null; | 67 | xtr.XmlResolver = null; |
68 | 68 | ||
69 | xtr.ReadStartElement("RegionSettings"); | 69 | xtr.ReadStartElement("RegionSettings"); |
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs index 3c51140..f13bb2c 100644 --- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs +++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs | |||
@@ -202,7 +202,7 @@ namespace OpenSim.Framework.Serialization.External | |||
202 | 202 | ||
203 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization))) | 203 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization))) |
204 | { | 204 | { |
205 | reader.DtdProcessing = DtdProcessing.Prohibit; | 205 | reader.ProhibitDtd = true; |
206 | reader.XmlResolver = null; | 206 | reader.XmlResolver = null; |
207 | 207 | ||
208 | reader.ReadStartElement("InventoryItem"); | 208 | reader.ReadStartElement("InventoryItem"); |