aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Serialization/External
diff options
context:
space:
mode:
authorUbitUmarov2018-01-17 04:18:43 +0000
committerUbitUmarov2018-01-17 04:18:43 +0000
commit029d6e40f675387e42ca575ba467dea95cddb3dc (patch)
tree5759ca9c58c5dbfe51d68ac8c5d1b1bc7be5d549 /OpenSim/Framework/Serialization/External
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 'OpenSim/Framework/Serialization/External')
-rw-r--r--OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs2
-rw-r--r--OpenSim/Framework/Serialization/External/LandDataSerializer.cs1
-rw-r--r--OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs1
-rw-r--r--OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs2
4 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index af130a5..64b5d41 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})) 224 using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment}))
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 33ffd83..e42d56f 100644
--- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -178,7 +178,6 @@ 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.ProhibitDtd = true;
182 reader.ReadStartElement("LandData"); 181 reader.ReadStartElement("LandData");
183 182
184 ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader); 183 ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader);
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index fd21f3e..617c451 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -63,7 +63,6 @@ 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.ProhibitDtd = true;
67 66
68 xtr.ReadStartElement("RegionSettings"); 67 xtr.ReadStartElement("RegionSettings");
69 68
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index 12194ad..9b02553 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -202,8 +202,6 @@ 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.ProhibitDtd = true;
206
207 reader.ReadStartElement("InventoryItem"); 205 reader.ReadStartElement("InventoryItem");
208 206
209 ExternalRepresentationUtils.ExecuteReadProcessors<InventoryItemBase>( 207 ExternalRepresentationUtils.ExecuteReadProcessors<InventoryItemBase>(