aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorUbitUmarov2018-01-08 12:00:21 +0000
committerUbitUmarov2018-01-08 12:00:21 +0000
commiteec3921800e3a19f210c0488d78399c210f9b9d6 (patch)
tree9d1f1dfc98e518e060b5d172891051edae8c9561 /OpenSim/Framework
parent a few more xml things (diff)
downloadopensim-SC_OLD-eec3921800e3a19f210c0488d78399c210f9b9d6.zip
opensim-SC_OLD-eec3921800e3a19f210c0488d78399c210f9b9d6.tar.gz
opensim-SC_OLD-eec3921800e3a19f210c0488d78399c210f9b9d6.tar.bz2
opensim-SC_OLD-eec3921800e3a19f210c0488d78399c210f9b9d6.tar.xz
fall back to a obsolete property since several monos in use (include our own) do not suporte the proper .net4.0 one
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PhysicsInertia.cs2
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs2
-rw-r--r--OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs2
-rw-r--r--OpenSim/Framework/Serialization/External/LandDataSerializer.cs2
-rw-r--r--OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs2
-rw-r--r--OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs2
-rw-r--r--OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs2
-rw-r--r--OpenSim/Framework/Servers/HttpServer/RestSessionService.cs4
8 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Framework/PhysicsInertia.cs b/OpenSim/Framework/PhysicsInertia.cs
index 8a0e43e..3a55f8a 100644
--- a/OpenSim/Framework/PhysicsInertia.cs
+++ b/OpenSim/Framework/PhysicsInertia.cs
@@ -193,7 +193,7 @@ namespace OpenSim.Framework
193 using(MemoryStream ms = new MemoryStream(enc.GetBytes(text))) 193 using(MemoryStream ms = new MemoryStream(enc.GetBytes(text)))
194 using(XmlTextReader xreader = new XmlTextReader(ms)) 194 using(XmlTextReader xreader = new XmlTextReader(ms))
195 { 195 {
196 xreader.DtdProcessing = DtdProcessing.Prohibit; 196 xreader.ProhibitDtd = true;
197 xreader.XmlResolver = null; 197 xreader.XmlResolver = null;
198 198
199 v = new PhysicsInertiaData(); 199 v = new PhysicsInertiaData();
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 1dc8bc3..d071b8c 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -1595,7 +1595,7 @@ namespace OpenSim.Framework
1595 { 1595 {
1596 using (XmlTextReader xtr = new XmlTextReader(sr)) 1596 using (XmlTextReader xtr = new XmlTextReader(sr))
1597 { 1597 {
1598 xtr.DtdProcessing = DtdProcessing.Prohibit; 1598 xtr.ProhibitDtd = true;
1599 xtr.XmlResolver = null; 1599 xtr.XmlResolver = null;
1600 1600
1601 xtr.MoveToContent(); 1601 xtr.MoveToContent();
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index da877a7..2d4bdbc 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, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null })) 224 using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true, XmlResolver = null }))
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 d323f45..7e17bc0 100644
--- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -178,7 +178,7 @@ namespace OpenSim.Framework.Serialization.External
178 178
179 using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData))) 179 using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData)))
180 { 180 {
181 reader.DtdProcessing = DtdProcessing.Prohibit; 181 reader.ProhibitDtd = true;
182 reader.XmlResolver = null; 182 reader.XmlResolver = null;
183 reader.ReadStartElement("LandData"); 183 reader.ReadStartElement("LandData");
184 184
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index fb4f904..6ff5687 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Framework.Serialization.External
63 63
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.DtdProcessing = DtdProcessing.Prohibit; 66 xtr.ProhibitDtd = true;
67 xtr.XmlResolver = null; 67 xtr.XmlResolver = null;
68 68
69 xtr.ReadStartElement("RegionSettings"); 69 xtr.ReadStartElement("RegionSettings");
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index 3c51140..f13bb2c 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -202,7 +202,7 @@ namespace OpenSim.Framework.Serialization.External
202 202
203 using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization))) 203 using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization)))
204 { 204 {
205 reader.DtdProcessing = DtdProcessing.Prohibit; 205 reader.ProhibitDtd = true;
206 reader.XmlResolver = null; 206 reader.XmlResolver = null;
207 207
208 reader.ReadStartElement("InventoryItem"); 208 reader.ReadStartElement("InventoryItem");
diff --git a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
index fbc51d5..7e2d909 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Framework.Servers.HttpServer
54 TRequest deserial; 54 TRequest deserial;
55 using (XmlTextReader xmlReader = new XmlTextReader(request)) 55 using (XmlTextReader xmlReader = new XmlTextReader(request))
56 { 56 {
57 xmlReader.DtdProcessing = DtdProcessing.Prohibit; 57 xmlReader.ProhibitDtd = true;
58 xmlReader.XmlResolver = null; 58 xmlReader.XmlResolver = null;
59 59
60 XmlSerializer deserializer = new XmlSerializer(typeof (TRequest)); 60 XmlSerializer deserializer = new XmlSerializer(typeof (TRequest));
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index dc720dd..1887a13 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -210,7 +210,7 @@ namespace OpenSim.Framework.Servers.HttpServer
210 { 210 {
211 try 211 try
212 { 212 {
213 xmlReader.DtdProcessing = DtdProcessing.Prohibit; 213 xmlReader.ProhibitDtd = true;
214 xmlReader.XmlResolver = null; 214 xmlReader.XmlResolver = null;
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);
@@ -271,7 +271,7 @@ namespace OpenSim.Framework.Servers.HttpServer
271 { 271 {
272 try 272 try
273 { 273 {
274 xmlReader.DtdProcessing = DtdProcessing.Prohibit; 274 xmlReader.ProhibitDtd = true;
275 xmlReader.XmlResolver = null; 275 xmlReader.XmlResolver = null;
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);