ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

give up on a property that old monos do compile, but then smore ok exec

Browse Source
This commit is contained in:
UbitUmarov
2018-01-09 19:47:10 +00:00
parent 1a6770191c
commit e908c0ecad
18 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/PhysicsInertia.cs
View File

@@ -194,7 +194,6 @@ namespace OpenSim.Framework
using(XmlTextReader xreader = new XmlTextReader(ms))
{
xreader.ProhibitDtd = true;
xreader.XmlResolver = null;
v = new PhysicsInertiaData();
v.FromXml2(xreader, out error);

1
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@@ -1596,7 +1596,6 @@ namespace OpenSim.Framework
using (XmlTextReader xtr = new XmlTextReader(sr))
{
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, ProhibitDtd = true, XmlResolver = null }))
using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true}))
{
TransformXml(reader, writer, sceneName, homeURL, userService, scopeID);

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

@@ -179,7 +179,6 @@ namespace OpenSim.Framework.Serialization.External
using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData)))
{
reader.ProhibitDtd = true;
reader.XmlResolver = null;
reader.ReadStartElement("LandData");
ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader);

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

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

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

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

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

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

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

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