aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Capabilities/LLSD.cs1
-rw-r--r--OpenSim/Framework/PhysicsInertia.cs1
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs1
-rw-r--r--OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs2
-rw-r--r--OpenSim/Framework/Serialization/External/LandDataSerializer.cs1
-rw-r--r--OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs1
-rw-r--r--OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs1
-rw-r--r--OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/HttpServer/RestSessionService.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SOPVehicle.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/TerrainChannel.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs1
18 files changed, 9 insertions, 20 deletions
diff --git a/OpenSim/Capabilities/LLSD.cs b/OpenSim/Capabilities/LLSD.cs
index 20df8b4..fc41113 100644
--- a/OpenSim/Capabilities/LLSD.cs
+++ b/OpenSim/Capabilities/LLSD.cs
@@ -84,7 +84,6 @@ namespace OpenSim.Framework.Capabilities
84 using (XmlTextReader reader = new XmlTextReader(st)) 84 using (XmlTextReader reader = new XmlTextReader(st))
85 { 85 {
86 reader.ProhibitDtd = true; 86 reader.ProhibitDtd = true;
87 reader.XmlResolver = null;
88 87
89 reader.Read(); 88 reader.Read();
90 SkipWS(reader); 89 SkipWS(reader);
diff --git a/OpenSim/Framework/PhysicsInertia.cs b/OpenSim/Framework/PhysicsInertia.cs
index 3a55f8a..fa83de8 100644
--- a/OpenSim/Framework/PhysicsInertia.cs
+++ b/OpenSim/Framework/PhysicsInertia.cs
@@ -194,7 +194,6 @@ namespace OpenSim.Framework
194 using(XmlTextReader xreader = new XmlTextReader(ms)) 194 using(XmlTextReader xreader = new XmlTextReader(ms))
195 { 195 {
196 xreader.ProhibitDtd = true; 196 xreader.ProhibitDtd = true;
197 xreader.XmlResolver = null;
198 197
199 v = new PhysicsInertiaData(); 198 v = new PhysicsInertiaData();
200 v.FromXml2(xreader, out error); 199 v.FromXml2(xreader, out error);
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index d071b8c..6e7a038 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -1596,7 +1596,6 @@ namespace OpenSim.Framework
1596 using (XmlTextReader xtr = new XmlTextReader(sr)) 1596 using (XmlTextReader xtr = new XmlTextReader(sr))
1597 { 1597 {
1598 xtr.ProhibitDtd = true; 1598 xtr.ProhibitDtd = true;
1599 xtr.XmlResolver = null;
1600 1599
1601 xtr.MoveToContent(); 1600 xtr.MoveToContent();
1602 1601
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index 2d4bdbc..af130a5 100644
--- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
+++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
@@ -221,7 +221,7 @@ namespace OpenSim.Framework.Serialization.External
221 using (StringWriter sw = new StringWriter()) 221 using (StringWriter sw = new StringWriter())
222 using (XmlTextWriter writer = new XmlTextWriter(sw)) 222 using (XmlTextWriter writer = new XmlTextWriter(sw))
223 using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null)) 223 using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
224 using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true, XmlResolver = null })) 224 using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true}))
225 { 225 {
226 TransformXml(reader, writer, sceneName, homeURL, userService, scopeID); 226 TransformXml(reader, writer, sceneName, homeURL, userService, scopeID);
227 227
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
index 7e17bc0..33ffd83 100644
--- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -179,7 +179,6 @@ namespace OpenSim.Framework.Serialization.External
179 using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData))) 179 using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData)))
180 { 180 {
181 reader.ProhibitDtd = true; 181 reader.ProhibitDtd = true;
182 reader.XmlResolver = null;
183 reader.ReadStartElement("LandData"); 182 reader.ReadStartElement("LandData");
184 183
185 ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader); 184 ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader);
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index 6ff5687..fd21f3e 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -64,7 +64,6 @@ namespace OpenSim.Framework.Serialization.External
64 StringReader sr = new StringReader(serializedSettings); 64 StringReader sr = new StringReader(serializedSettings);
65 XmlTextReader xtr = new XmlTextReader(sr); 65 XmlTextReader xtr = new XmlTextReader(sr);
66 xtr.ProhibitDtd = true; 66 xtr.ProhibitDtd = true;
67 xtr.XmlResolver = null;
68 67
69 xtr.ReadStartElement("RegionSettings"); 68 xtr.ReadStartElement("RegionSettings");
70 69
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index f13bb2c..12194ad 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -203,7 +203,6 @@ namespace OpenSim.Framework.Serialization.External
203 using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization))) 203 using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization)))
204 { 204 {
205 reader.ProhibitDtd = true; 205 reader.ProhibitDtd = true;
206 reader.XmlResolver = null;
207 206
208 reader.ReadStartElement("InventoryItem"); 207 reader.ReadStartElement("InventoryItem");
209 208
diff --git a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
index 7e2d909..67fc14e 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
@@ -55,7 +55,6 @@ namespace OpenSim.Framework.Servers.HttpServer
55 using (XmlTextReader xmlReader = new XmlTextReader(request)) 55 using (XmlTextReader xmlReader = new XmlTextReader(request))
56 { 56 {
57 xmlReader.ProhibitDtd = true; 57 xmlReader.ProhibitDtd = true;
58 xmlReader.XmlResolver = null;
59 58
60 XmlSerializer deserializer = new XmlSerializer(typeof (TRequest)); 59 XmlSerializer deserializer = new XmlSerializer(typeof (TRequest));
61 deserial = (TRequest) deserializer.Deserialize(xmlReader); 60 deserial = (TRequest) deserializer.Deserialize(xmlReader);
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index 1887a13..158befa 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -211,7 +211,7 @@ namespace OpenSim.Framework.Servers.HttpServer
211 try 211 try
212 { 212 {
213 xmlReader.ProhibitDtd = true; 213 xmlReader.ProhibitDtd = true;
214 xmlReader.XmlResolver = null; 214
215 XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>)); 215 XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>));
216 deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader); 216 deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader);
217 } 217 }
@@ -272,7 +272,7 @@ namespace OpenSim.Framework.Servers.HttpServer
272 try 272 try
273 { 273 {
274 xmlReader.ProhibitDtd = true; 274 xmlReader.ProhibitDtd = true;
275 xmlReader.XmlResolver = null; 275
276 XmlSerializer deserializer = new XmlSerializer(typeof(TRequest)); 276 XmlSerializer deserializer = new XmlSerializer(typeof(TRequest));
277 deserial = (TRequest)deserializer.Deserialize(xmlReader); 277 deserial = (TRequest)deserializer.Deserialize(xmlReader);
278 } 278 }
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
index eb3c115..61e461a 100644
--- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
125 using(XmlTextReader sr = new XmlTextReader(s)) 125 using(XmlTextReader sr = new XmlTextReader(s))
126 { 126 {
127 sr.ProhibitDtd = true; 127 sr.ProhibitDtd = true;
128 sr.XmlResolver = null; 128
129 sr.ReadStartElement("BakedAppearance"); 129 sr.ReadStartElement("BakedAppearance");
130 while(sr.LocalName == "BakedTexture") 130 while(sr.LocalName == "BakedTexture")
131 { 131 {
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
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 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index a5c7d61..defaa9c 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -1149,7 +1149,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1149 using (XmlTextReader rdr = new XmlTextReader(s)) 1149 using (XmlTextReader rdr = new XmlTextReader(s))
1150 { 1150 {
1151 rdr.ProhibitDtd = true; 1151 rdr.ProhibitDtd = true;
1152 rdr.XmlResolver = null;
1153 doc.Load(rdr); 1152 doc.Load(rdr);
1154 } 1153 }
1155 } 1154 }