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/CoreModules | |
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 'OpenSim/Region/CoreModules')
3 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs index 61e461a..cfa9581 100644 --- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs | |||
@@ -124,8 +124,6 @@ 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.ProhibitDtd = true; | ||
128 | |||
129 | sr.ReadStartElement("BakedAppearance"); | 127 | sr.ReadStartElement("BakedAppearance"); |
130 | while(sr.LocalName == "BakedTexture") | 128 | while(sr.LocalName == "BakedTexture") |
131 | { | 129 | { |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 41515c0..99ff9b5 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -1130,7 +1130,6 @@ 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.ProhibitDtd = true; | ||
1134 | 1133 | ||
1135 | // Loaded metadata will be empty if no information exists in the archive | 1134 | // Loaded metadata will be empty if no information exists in the archive |
1136 | dearchivedScenes.LoadedCreationDateTime = 0; | 1135 | dearchivedScenes.LoadedCreationDateTime = 0; |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs index 5d3be62..8c0ef88 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | |||
@@ -93,7 +93,6 @@ 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.ProhibitDtd = true; | ||
97 | 96 | ||
98 | reader.ReadStartElement("assets"); | 97 | reader.ReadStartElement("assets"); |
99 | reader.Read(); | 98 | reader.Read(); |