diff options
author | UbitUmarov | 2018-01-17 04:18:43 +0000 |
---|---|---|
committer | UbitUmarov | 2018-01-17 04:18:43 +0000 |
commit | 029d6e40f675387e42ca575ba467dea95cddb3dc (patch) | |
tree | 5759ca9c58c5dbfe51d68ac8c5d1b1bc7be5d549 /OpenSim/Region/Framework | |
parent | update DotNetOpenId (.net4.6) (diff) | |
download | opensim-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 '')
7 files changed, 2 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs index 2128d58..78f545b 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs | |||
@@ -58,8 +58,6 @@ 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.ProhibitDtd = true; | ||
62 | |||
63 | XmlDocument doc = new XmlDocument(); | 61 | XmlDocument doc = new XmlDocument(); |
64 | doc.XmlResolver = null; | 62 | doc.XmlResolver = null; |
65 | 63 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs index 6683614..351eda3 100644 --- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs +++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs | |||
@@ -593,7 +593,6 @@ 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.ProhibitDtd = true; | ||
597 | 596 | ||
598 | SOPVehicle v = new SOPVehicle(); | 597 | SOPVehicle v = new SOPVehicle(); |
599 | bool error; | 598 | bool error; |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index b3303a0..e8a8a6e 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, ProhibitDtd = true })) | 2392 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment})) |
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 abcb573..a93782e 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | |||
@@ -133,8 +133,6 @@ 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.ProhibitDtd = true; | ||
137 | |||
138 | reader.MoveToContent(); // skip possible xml declaration | 136 | reader.MoveToContent(); // skip possible xml declaration |
139 | 137 | ||
140 | if (reader.Name != "CoalescedObject") | 138 | if (reader.Name != "CoalescedObject") |
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 |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs index 0ebc645..09e3f9c 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | |||
@@ -57,7 +57,6 @@ 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.ProhibitDtd = true; | ||
61 | 60 | ||
62 | doc.Load(reader); | 61 | doc.Load(reader); |
63 | } | 62 | } |
diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs index 20bad94..92fd314 100644 --- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs +++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs | |||
@@ -199,11 +199,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
199 | using(StringReader sr = new StringReader(data)) | 199 | using(StringReader sr = new StringReader(data)) |
200 | { | 200 | { |
201 | using(XmlTextReader reader = new XmlTextReader(sr)) | 201 | using(XmlTextReader reader = new XmlTextReader(sr)) |
202 | { | ||
203 | reader.ProhibitDtd = true; | ||
204 | |||
205 | ReadXml(reader); | 202 | ReadXml(reader); |
206 | } | ||
207 | } | 203 | } |
208 | } | 204 | } |
209 | 205 | ||