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/Region/Framework/Scenes | |
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 '')
7 files changed, 8 insertions, 8 deletions
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 | } |