aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorUbitUmarov2018-01-05 12:24:07 +0000
committerUbitUmarov2018-01-05 12:24:07 +0000
commit89a690c11f8c7b6bbe0b6339e79a64d1ae428aec (patch)
treeeb039c92222bf22359a20ecb5294b8ab1b2a38eb /OpenSim/Region/CoreModules
parentdon't be bad Jenkins.. (diff)
downloadopensim-SC_OLD-89a690c11f8c7b6bbe0b6339e79a64d1ae428aec.zip
opensim-SC_OLD-89a690c11f8c7b6bbe0b6339e79a64d1ae428aec.tar.gz
opensim-SC_OLD-89a690c11f8c7b6bbe0b6339e79a64d1ae428aec.tar.bz2
opensim-SC_OLD-89a690c11f8c7b6bbe0b6339e79a64d1ae428aec.tar.xz
a few more xml things
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs2
3 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
index cfa9581..013b416 100644
--- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
@@ -124,6 +124,8 @@ 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.DtdProcessing = DtdProcessing.Prohibit;
128 sr.XmlResolver = null;
127 sr.ReadStartElement("BakedAppearance"); 129 sr.ReadStartElement("BakedAppearance");
128 while(sr.LocalName == "BakedTexture") 130 while(sr.LocalName == "BakedTexture")
129 { 131 {
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 99ff9b5..63ebf86 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -1130,6 +1130,8 @@ 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.DtdProcessing = DtdProcessing.Prohibit;
1134 xtr.XmlResolver = null;
1133 1135
1134 // Loaded metadata will be empty if no information exists in the archive 1136 // Loaded metadata will be empty if no information exists in the archive
1135 dearchivedScenes.LoadedCreationDateTime = 0; 1137 dearchivedScenes.LoadedCreationDateTime = 0;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index 8c0ef88..92c935b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -93,6 +93,8 @@ 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.DtdProcessing = DtdProcessing.Prohibit;
97 reader.XmlResolver = null;
96 98
97 reader.ReadStartElement("assets"); 99 reader.ReadStartElement("assets");
98 reader.Read(); 100 reader.Read();