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/CoreModules/World | |
parent | test our obsolete jenkins ... (diff) | |
download | opensim-SC_OLD-e908c0ecadb9d44102ee649c5f9184e6e3034541.zip opensim-SC_OLD-e908c0ecadb9d44102ee649c5f9184e6e3034541.tar.gz opensim-SC_OLD-e908c0ecadb9d44102ee649c5f9184e6e3034541.tar.bz2 opensim-SC_OLD-e908c0ecadb9d44102ee649c5f9184e6e3034541.tar.xz |
give up on a property that old monos do compile, but then smore ok exec
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
3 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 78abaed..41515c0 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -1131,7 +1131,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
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.ProhibitDtd = true; | 1133 | xtr.ProhibitDtd = true; |
1134 | xtr.XmlResolver = null; | ||
1135 | 1134 | ||
1136 | // Loaded metadata will be empty if no information exists in the archive | 1135 | // Loaded metadata will be empty if no information exists in the archive |
1137 | dearchivedScenes.LoadedCreationDateTime = 0; | 1136 | dearchivedScenes.LoadedCreationDateTime = 0; |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs index 9a19ad9..5d3be62 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | |||
@@ -94,7 +94,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
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.ProhibitDtd = true; | 96 | reader.ProhibitDtd = true; |
97 | reader.XmlResolver = null; | ||
98 | 97 | ||
99 | reader.ReadStartElement("assets"); | 98 | reader.ReadStartElement("assets"); |
100 | reader.Read(); | 99 | reader.Read(); |
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs index 8ac4de1..23475a1 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs | |||
@@ -721,7 +721,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests | |||
721 | 721 | ||
722 | XmlTextReader xtr = new XmlTextReader(new StringReader(xml)); | 722 | XmlTextReader xtr = new XmlTextReader(new StringReader(xml)); |
723 | xtr.ProhibitDtd = true; | 723 | xtr.ProhibitDtd = true; |
724 | xtr.XmlResolver = null; | 724 | |
725 | xtr.ReadStartElement("SceneObjectGroup"); | 725 | xtr.ReadStartElement("SceneObjectGroup"); |
726 | xtr.ReadStartElement("RootPart"); | 726 | xtr.ReadStartElement("RootPart"); |
727 | xtr.ReadStartElement("SceneObjectPart"); | 727 | xtr.ReadStartElement("SceneObjectPart"); |
@@ -834,7 +834,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests | |||
834 | 834 | ||
835 | XmlTextReader xtr = new XmlTextReader(new StringReader(xml2)); | 835 | XmlTextReader xtr = new XmlTextReader(new StringReader(xml2)); |
836 | xtr.ProhibitDtd = true; | 836 | xtr.ProhibitDtd = true; |
837 | xtr.XmlResolver = null; | 837 | |
838 | xtr.ReadStartElement("SceneObjectGroup"); | 838 | xtr.ReadStartElement("SceneObjectGroup"); |
839 | xtr.ReadStartElement("SceneObjectPart"); | 839 | xtr.ReadStartElement("SceneObjectPart"); |
840 | 840 | ||