diff options
author | UbitUmarov | 2018-01-09 19:47:10 +0000 |
---|---|---|
committer | UbitUmarov | 2018-01-09 19:47:10 +0000 |
commit | e908c0ecadb9d44102ee649c5f9184e6e3034541 (patch) | |
tree | 6e863f496489ada72c128a6f545898b849d8f876 /OpenSim/Framework/Serialization/External | |
parent | test our obsolete jenkins ... (diff) | |
download | opensim-SC-e908c0ecadb9d44102ee649c5f9184e6e3034541.zip opensim-SC-e908c0ecadb9d44102ee649c5f9184e6e3034541.tar.gz opensim-SC-e908c0ecadb9d44102ee649c5f9184e6e3034541.tar.bz2 opensim-SC-e908c0ecadb9d44102ee649c5f9184e6e3034541.tar.xz |
give up on a property that old monos do compile, but then smore ok exec
Diffstat (limited to 'OpenSim/Framework/Serialization/External')
4 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs index 2d4bdbc..af130a5 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, ProhibitDtd = true, XmlResolver = null })) | 224 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true})) |
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 7e17bc0..33ffd83 100644 --- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs +++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs | |||
@@ -179,7 +179,6 @@ namespace OpenSim.Framework.Serialization.External | |||
179 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData))) | 179 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData))) |
180 | { | 180 | { |
181 | reader.ProhibitDtd = true; | 181 | reader.ProhibitDtd = true; |
182 | reader.XmlResolver = null; | ||
183 | reader.ReadStartElement("LandData"); | 182 | reader.ReadStartElement("LandData"); |
184 | 183 | ||
185 | ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader); | 184 | ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader); |
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs index 6ff5687..fd21f3e 100644 --- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs +++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs | |||
@@ -64,7 +64,6 @@ namespace OpenSim.Framework.Serialization.External | |||
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.ProhibitDtd = true; | 66 | xtr.ProhibitDtd = true; |
67 | xtr.XmlResolver = null; | ||
68 | 67 | ||
69 | xtr.ReadStartElement("RegionSettings"); | 68 | xtr.ReadStartElement("RegionSettings"); |
70 | 69 | ||
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs index f13bb2c..12194ad 100644 --- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs +++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs | |||
@@ -203,7 +203,6 @@ namespace OpenSim.Framework.Serialization.External | |||
203 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization))) | 203 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization))) |
204 | { | 204 | { |
205 | reader.ProhibitDtd = true; | 205 | reader.ProhibitDtd = true; |
206 | reader.XmlResolver = null; | ||
207 | 206 | ||
208 | reader.ReadStartElement("InventoryItem"); | 207 | reader.ReadStartElement("InventoryItem"); |
209 | 208 | ||