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/Region/Framework/Scenes | |
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/Region/Framework/Scenes')
4 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs index 77edb4c..2128d58 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
59 | using (XmlTextReader reader = new XmlTextReader(path)) | 59 | using (XmlTextReader reader = new XmlTextReader(path)) |
60 | { | 60 | { |
61 | reader.ProhibitDtd = true; | 61 | reader.ProhibitDtd = true; |
62 | // reader.XmlResolver = null; | 62 | |
63 | XmlDocument doc = new XmlDocument(); | 63 | XmlDocument doc = new XmlDocument(); |
64 | doc.XmlResolver = null; | 64 | doc.XmlResolver = null; |
65 | 65 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs index 0a1923a..6683614 100644 --- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs +++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs | |||
@@ -594,7 +594,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
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; | 596 | xreader.ProhibitDtd = true; |
597 | xreader.XmlResolver = null; | ||
598 | 597 | ||
599 | SOPVehicle v = new SOPVehicle(); | 598 | SOPVehicle v = new SOPVehicle(); |
600 | bool error; | 599 | bool error; |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index a3c7dbc..b3303a0 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, XmlResolver = null })) | 2392 | using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true })) |
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/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs index 6ebe897..20bad94 100644 --- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs +++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs | |||
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
201 | using(XmlTextReader reader = new XmlTextReader(sr)) | 201 | using(XmlTextReader reader = new XmlTextReader(sr)) |
202 | { | 202 | { |
203 | reader.ProhibitDtd = true; | 203 | reader.ProhibitDtd = true; |
204 | reader.XmlResolver = null; | 204 | |
205 | ReadXml(reader); | 205 | ReadXml(reader); |
206 | } | 206 | } |
207 | } | 207 | } |