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 | |
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 '')
21 files changed, 26 insertions, 22 deletions
diff --git a/OpenSim/Capabilities/LLSD.cs b/OpenSim/Capabilities/LLSD.cs index 5ed312c..20df8b4 100644 --- a/OpenSim/Capabilities/LLSD.cs +++ b/OpenSim/Capabilities/LLSD.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Capabilities | |||
83 | { | 83 | { |
84 | using (XmlTextReader reader = new XmlTextReader(st)) | 84 | using (XmlTextReader reader = new XmlTextReader(st)) |
85 | { | 85 | { |
86 | reader.DtdProcessing = DtdProcessing.Prohibit; | 86 | reader.ProhibitDtd = true; |
87 | reader.XmlResolver = null; | 87 | reader.XmlResolver = null; |
88 | 88 | ||
89 | reader.Read(); | 89 | reader.Read(); |
diff --git a/OpenSim/Framework/PhysicsInertia.cs b/OpenSim/Framework/PhysicsInertia.cs index 8a0e43e..3a55f8a 100644 --- a/OpenSim/Framework/PhysicsInertia.cs +++ b/OpenSim/Framework/PhysicsInertia.cs | |||
@@ -193,7 +193,7 @@ namespace OpenSim.Framework | |||
193 | using(MemoryStream ms = new MemoryStream(enc.GetBytes(text))) | 193 | using(MemoryStream ms = new MemoryStream(enc.GetBytes(text))) |
194 | using(XmlTextReader xreader = new XmlTextReader(ms)) | 194 | using(XmlTextReader xreader = new XmlTextReader(ms)) |
195 | { | 195 | { |
196 | xreader.DtdProcessing = DtdProcessing.Prohibit; | 196 | xreader.ProhibitDtd = true; |
197 | xreader.XmlResolver = null; | 197 | xreader.XmlResolver = null; |
198 | 198 | ||
199 | v = new PhysicsInertiaData(); | 199 | v = new PhysicsInertiaData(); |
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 1dc8bc3..d071b8c 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
@@ -1595,7 +1595,7 @@ namespace OpenSim.Framework | |||
1595 | { | 1595 | { |
1596 | using (XmlTextReader xtr = new XmlTextReader(sr)) | 1596 | using (XmlTextReader xtr = new XmlTextReader(sr)) |
1597 | { | 1597 | { |
1598 | xtr.DtdProcessing = DtdProcessing.Prohibit; | 1598 | xtr.ProhibitDtd = true; |
1599 | xtr.XmlResolver = null; | 1599 | xtr.XmlResolver = null; |
1600 | 1600 | ||
1601 | xtr.MoveToContent(); | 1601 | xtr.MoveToContent(); |
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"); |
diff --git a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs index fbc51d5..7e2d909 100644 --- a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs +++ b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs | |||
@@ -54,7 +54,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
54 | TRequest deserial; | 54 | TRequest deserial; |
55 | using (XmlTextReader xmlReader = new XmlTextReader(request)) | 55 | using (XmlTextReader xmlReader = new XmlTextReader(request)) |
56 | { | 56 | { |
57 | xmlReader.DtdProcessing = DtdProcessing.Prohibit; | 57 | xmlReader.ProhibitDtd = true; |
58 | xmlReader.XmlResolver = null; | 58 | xmlReader.XmlResolver = null; |
59 | 59 | ||
60 | XmlSerializer deserializer = new XmlSerializer(typeof (TRequest)); | 60 | XmlSerializer deserializer = new XmlSerializer(typeof (TRequest)); |
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs index dc720dd..1887a13 100644 --- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs +++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs | |||
@@ -210,7 +210,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
210 | { | 210 | { |
211 | try | 211 | try |
212 | { | 212 | { |
213 | xmlReader.DtdProcessing = DtdProcessing.Prohibit; | 213 | xmlReader.ProhibitDtd = true; |
214 | xmlReader.XmlResolver = null; | 214 | xmlReader.XmlResolver = null; |
215 | XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>)); | 215 | XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>)); |
216 | deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader); | 216 | deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader); |
@@ -271,7 +271,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
271 | { | 271 | { |
272 | try | 272 | try |
273 | { | 273 | { |
274 | xmlReader.DtdProcessing = DtdProcessing.Prohibit; | 274 | xmlReader.ProhibitDtd = true; |
275 | xmlReader.XmlResolver = null; | 275 | xmlReader.XmlResolver = null; |
276 | XmlSerializer deserializer = new XmlSerializer(typeof(TRequest)); | 276 | XmlSerializer deserializer = new XmlSerializer(typeof(TRequest)); |
277 | deserial = (TRequest)deserializer.Deserialize(xmlReader); | 277 | deserial = (TRequest)deserializer.Deserialize(xmlReader); |
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs index 013b416..eb3c115 100644 --- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs | |||
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures | |||
124 | { | 124 | { |
125 | using(XmlTextReader sr = new XmlTextReader(s)) | 125 | using(XmlTextReader sr = new XmlTextReader(s)) |
126 | { | 126 | { |
127 | sr.DtdProcessing = DtdProcessing.Prohibit; | 127 | sr.ProhibitDtd = true; |
128 | sr.XmlResolver = null; | 128 | sr.XmlResolver = null; |
129 | sr.ReadStartElement("BakedAppearance"); | 129 | sr.ReadStartElement("BakedAppearance"); |
130 | while(sr.LocalName == "BakedTexture") | 130 | while(sr.LocalName == "BakedTexture") |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 63ebf86..78abaed 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -1130,7 +1130,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
1130 | XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable()); | 1130 | XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable()); |
1131 | XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); | 1131 | XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); |
1132 | XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context); | 1132 | XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context); |
1133 | xtr.DtdProcessing = DtdProcessing.Prohibit; | 1133 | xtr.ProhibitDtd = true; |
1134 | xtr.XmlResolver = null; | 1134 | xtr.XmlResolver = null; |
1135 | 1135 | ||
1136 | // Loaded metadata will be empty if no information exists in the archive | 1136 | // Loaded metadata will be empty if no information exists in the archive |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs index 92c935b..9a19ad9 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
93 | 93 | ||
94 | StringReader sr = new StringReader(xml); | 94 | StringReader sr = new StringReader(xml); |
95 | XmlTextReader reader = new XmlTextReader(sr); | 95 | XmlTextReader reader = new XmlTextReader(sr); |
96 | reader.DtdProcessing = DtdProcessing.Prohibit; | 96 | reader.ProhibitDtd = true; |
97 | reader.XmlResolver = null; | 97 | reader.XmlResolver = null; |
98 | 98 | ||
99 | reader.ReadStartElement("assets"); | 99 | reader.ReadStartElement("assets"); |
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs index c9e3141..8ac4de1 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs | |||
@@ -720,6 +720,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests | |||
720 | string xml = SceneObjectSerializer.ToOriginalXmlFormat(so); | 720 | string xml = SceneObjectSerializer.ToOriginalXmlFormat(so); |
721 | 721 | ||
722 | XmlTextReader xtr = new XmlTextReader(new StringReader(xml)); | 722 | XmlTextReader xtr = new XmlTextReader(new StringReader(xml)); |
723 | xtr.ProhibitDtd = true; | ||
724 | xtr.XmlResolver = null; | ||
723 | xtr.ReadStartElement("SceneObjectGroup"); | 725 | xtr.ReadStartElement("SceneObjectGroup"); |
724 | xtr.ReadStartElement("RootPart"); | 726 | xtr.ReadStartElement("RootPart"); |
725 | xtr.ReadStartElement("SceneObjectPart"); | 727 | xtr.ReadStartElement("SceneObjectPart"); |
@@ -831,6 +833,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests | |||
831 | string xml2 = m_serialiserModule.SerializeGroupToXml2(so, options); | 833 | string xml2 = m_serialiserModule.SerializeGroupToXml2(so, options); |
832 | 834 | ||
833 | XmlTextReader xtr = new XmlTextReader(new StringReader(xml2)); | 835 | XmlTextReader xtr = new XmlTextReader(new StringReader(xml2)); |
836 | xtr.ProhibitDtd = true; | ||
837 | xtr.XmlResolver = null; | ||
834 | xtr.ReadStartElement("SceneObjectGroup"); | 838 | xtr.ReadStartElement("SceneObjectGroup"); |
835 | xtr.ReadStartElement("SceneObjectPart"); | 839 | xtr.ReadStartElement("SceneObjectPart"); |
836 | 840 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs index 38ab934..e1f96a2 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
58 | 58 | ||
59 | using (XmlTextReader reader = new XmlTextReader(path)) | 59 | using (XmlTextReader reader = new XmlTextReader(path)) |
60 | { | 60 | { |
61 | reader.DtdProcessing = DtdProcessing.Prohibit; | 61 | reader.ProhibitDtd = true; |
62 | reader.XmlResolver = null; | 62 | reader.XmlResolver = null; |
63 | XmlDocument doc = new XmlDocument(); | 63 | XmlDocument doc = new XmlDocument(); |
64 | doc.XmlResolver = null; | 64 | doc.XmlResolver = null; |
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs index 22734b3..0a1923a 100644 --- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs +++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs | |||
@@ -593,7 +593,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
593 | UTF8Encoding enc = new UTF8Encoding(); | 593 | UTF8Encoding enc = new UTF8Encoding(); |
594 | MemoryStream ms = new MemoryStream(enc.GetBytes(text)); | 594 | MemoryStream ms = new MemoryStream(enc.GetBytes(text)); |
595 | XmlTextReader xreader = new XmlTextReader(ms); | 595 | XmlTextReader xreader = new XmlTextReader(ms); |
596 | xreader.DtdProcessing = DtdProcessing.Prohibit; | 596 | xreader.ProhibitDtd = true; |
597 | xreader.XmlResolver = null; | 597 | xreader.XmlResolver = null; |
598 | 598 | ||
599 | SOPVehicle v = new SOPVehicle(); | 599 | SOPVehicle v = new SOPVehicle(); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 84367df..a3c7dbc 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2389,7 +2389,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2389 | { | 2389 | { |
2390 | using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null)) | 2390 | using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null)) |
2391 | { | 2391 | { |
2392 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null })) | 2392 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true, XmlResolver = null })) |
2393 | { | 2393 | { |
2394 | reader.Read(); | 2394 | reader.Read(); |
2395 | bool isSingleObject = reader.Name != "CoalescedObject"; | 2395 | bool isSingleObject = reader.Name != "CoalescedObject"; |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs index c3bc4a0..abcd440 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | |||
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
133 | { | 133 | { |
134 | using (XmlTextReader reader = new XmlTextReader(sr)) | 134 | using (XmlTextReader reader = new XmlTextReader(sr)) |
135 | { | 135 | { |
136 | reader.DtdProcessing = DtdProcessing.Prohibit; | 136 | reader.ProhibitDtd = true; |
137 | reader.XmlResolver = null; | 137 | reader.XmlResolver = null; |
138 | 138 | ||
139 | reader.MoveToContent(); // skip possible xml declaration | 139 | reader.MoveToContent(); // skip possible xml declaration |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index a2d512a..2d8f3cd 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, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null })) | 66 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true, XmlResolver = null })) |
67 | { | 67 | { |
68 | try | 68 | try |
69 | { | 69 | { |
@@ -272,7 +272,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
272 | { | 272 | { |
273 | using(XmlTextReader reader = new XmlTextReader(sr)) | 273 | using(XmlTextReader reader = new XmlTextReader(sr)) |
274 | { | 274 | { |
275 | reader.DtdProcessing = DtdProcessing.Prohibit; | 275 | reader.ProhibitDtd = true; |
276 | reader.XmlResolver = null; | 276 | reader.XmlResolver = null; |
277 | 277 | ||
278 | sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader)); | 278 | sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader)); |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs index 977dd73..e486580 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
57 | using(XmlTextReader reader = new XmlTextReader(fileName)) | 57 | using(XmlTextReader reader = new XmlTextReader(fileName)) |
58 | { | 58 | { |
59 | reader.WhitespaceHandling = WhitespaceHandling.None; | 59 | reader.WhitespaceHandling = WhitespaceHandling.None; |
60 | reader.DtdProcessing = DtdProcessing.Prohibit; | 60 | reader.ProhibitDtd = true; |
61 | reader.XmlResolver = null; | 61 | reader.XmlResolver = null; |
62 | 62 | ||
63 | doc.Load(reader); | 63 | doc.Load(reader); |
diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs index 1beca04..6ebe897 100644 --- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs +++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs | |||
@@ -200,7 +200,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
200 | { | 200 | { |
201 | using(XmlTextReader reader = new XmlTextReader(sr)) | 201 | using(XmlTextReader reader = new XmlTextReader(sr)) |
202 | { | 202 | { |
203 | reader.DtdProcessing = DtdProcessing.Prohibit; | 203 | reader.ProhibitDtd = true; |
204 | reader.XmlResolver = null; | 204 | reader.XmlResolver = null; |
205 | ReadXml(reader); | 205 | ReadXml(reader); |
206 | } | 206 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 08242b6..a5c7d61 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -1148,7 +1148,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1148 | using (Stream s = rsp.GetResponseStream()) | 1148 | using (Stream s = rsp.GetResponseStream()) |
1149 | using (XmlTextReader rdr = new XmlTextReader(s)) | 1149 | using (XmlTextReader rdr = new XmlTextReader(s)) |
1150 | { | 1150 | { |
1151 | rdr.DtdProcessing = DtdProcessing.Prohibit; | 1151 | rdr.ProhibitDtd = true; |
1152 | rdr.XmlResolver = null; | 1152 | rdr.XmlResolver = null; |
1153 | doc.Load(rdr); | 1153 | doc.Load(rdr); |
1154 | } | 1154 | } |