ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fall back to a obsolete property since several monos in use (include our own) do not suporte the proper .net4.0 one

Browse Source
This commit is contained in:
UbitUmarov
2018-01-08 12:00:21 +00:00
parent 89a690c11f
commit eec3921800
21 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/PhysicsInertia.cs
View File

@@ -193,7 +193,7 @@ namespace OpenSim.Framework
using(MemoryStream ms = new MemoryStream(enc.GetBytes(text)))
using(XmlTextReader xreader = new XmlTextReader(ms))
{
xreader.DtdProcessing = DtdProcessing.Prohibit;
xreader.ProhibitDtd = true;
xreader.XmlResolver = null;
v = new PhysicsInertiaData();

2
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@@ -1595,7 +1595,7 @@ namespace OpenSim.Framework
{
using (XmlTextReader xtr = new XmlTextReader(sr))
{
xtr.DtdProcessing = DtdProcessing.Prohibit;
xtr.ProhibitDtd = true;
xtr.XmlResolver = null;
xtr.MoveToContent();

2
OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs vendored
View File

@@ -221,7 +221,7 @@ namespace OpenSim.Framework.Serialization.External
using (StringWriter sw = new StringWriter())
using (XmlTextWriter writer = new XmlTextWriter(sw))
using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null }))
using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true, XmlResolver = null }))
{
TransformXml(reader, writer, sceneName, homeURL, userService, scopeID);

2
OpenSim/Framework/Serialization/External/LandDataSerializer.cs vendored
View File

@@ -178,7 +178,7 @@ namespace OpenSim.Framework.Serialization.External
using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData)))
{
reader.DtdProcessing = DtdProcessing.Prohibit;
reader.ProhibitDtd = true;
reader.XmlResolver = null;
reader.ReadStartElement("LandData");

2
OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs vendored
View File

@@ -63,7 +63,7 @@ namespace OpenSim.Framework.Serialization.External
StringReader sr = new StringReader(serializedSettings);
XmlTextReader xtr = new XmlTextReader(sr);
xtr.DtdProcessing = DtdProcessing.Prohibit;
xtr.ProhibitDtd = true;
xtr.XmlResolver = null;
xtr.ReadStartElement("RegionSettings");

2
OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs vendored
View File

@@ -202,7 +202,7 @@ namespace OpenSim.Framework.Serialization.External
using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization)))
{
reader.DtdProcessing = DtdProcessing.Prohibit;
reader.ProhibitDtd = true;
reader.XmlResolver = null;
reader.ReadStartElement("InventoryItem");

2
OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
View File

@@ -54,7 +54,7 @@ namespace OpenSim.Framework.Servers.HttpServer
TRequest deserial;
using (XmlTextReader xmlReader = new XmlTextReader(request))
{
xmlReader.DtdProcessing = DtdProcessing.Prohibit;
xmlReader.ProhibitDtd = true;
xmlReader.XmlResolver = null;
XmlSerializer deserializer = new XmlSerializer(typeof (TRequest));

4
OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
View File

@@ -210,7 +210,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{
try
{
xmlReader.DtdProcessing = DtdProcessing.Prohibit;
xmlReader.ProhibitDtd = true;
xmlReader.XmlResolver = null;
XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>));
deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader);
@@ -271,7 +271,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{
try
{
xmlReader.DtdProcessing = DtdProcessing.Prohibit;
xmlReader.ProhibitDtd = true;
xmlReader.XmlResolver = null;
XmlSerializer deserializer = new XmlSerializer(typeof(TRequest));
deserial = (TRequest)deserializer.Deserialize(xmlReader);