OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

0.9.0.1-postfixes
UbitUmarov 2018-01-09 19:47:10 +00:00
parent 1a6770191c
commit e908c0ecad
18 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Capabilities/LLSD.cs
View File

@ -84,7 +84,6 @@ namespace OpenSim.Framework.Capabilities
using (XmlTextReader reader = new XmlTextReader(st)) using (XmlTextReader reader = new XmlTextReader(st))
{ {
reader.ProhibitDtd = true; reader.ProhibitDtd = true;
reader.XmlResolver = null;
reader.Read(); reader.Read();
SkipWS(reader); SkipWS(reader);

1
OpenSim/Framework/PhysicsInertia.cs
View File

@ -194,7 +194,6 @@ namespace OpenSim.Framework
using(XmlTextReader xreader = new XmlTextReader(ms)) using(XmlTextReader xreader = new XmlTextReader(ms))
{ {
xreader.ProhibitDtd = true; xreader.ProhibitDtd = true;
xreader.XmlResolver = null;
v = new PhysicsInertiaData(); v = new PhysicsInertiaData();
v.FromXml2(xreader, out error); 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)) using (XmlTextReader xtr = new XmlTextReader(sr))
{ {
xtr.ProhibitDtd = true; xtr.ProhibitDtd = true;
xtr.XmlResolver = null;
xtr.MoveToContent(); 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 (StringWriter sw = new StringWriter())
using (XmlTextWriter writer = new XmlTextWriter(sw)) using (XmlTextWriter writer = new XmlTextWriter(sw))
using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null)) 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); 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))) using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData)))
{ {
reader.ProhibitDtd = true; reader.ProhibitDtd = true;
reader.XmlResolver = null;
reader.ReadStartElement("LandData"); reader.ReadStartElement("LandData");
ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader); 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); StringReader sr = new StringReader(serializedSettings);
XmlTextReader xtr = new XmlTextReader(sr); XmlTextReader xtr = new XmlTextReader(sr);
xtr.ProhibitDtd = true; xtr.ProhibitDtd = true;
xtr.XmlResolver = null;
xtr.ReadStartElement("RegionSettings"); 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))) using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization)))
{ {
reader.ProhibitDtd = true; reader.ProhibitDtd = true;
reader.XmlResolver = null;
reader.ReadStartElement("InventoryItem"); 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)) using (XmlTextReader xmlReader = new XmlTextReader(request))
{ {
xmlReader.ProhibitDtd = true; xmlReader.ProhibitDtd = true;
xmlReader.XmlResolver = null;
XmlSerializer deserializer = new XmlSerializer(typeof (TRequest)); XmlSerializer deserializer = new XmlSerializer(typeof (TRequest));
deserial = (TRequest) deserializer.Deserialize(xmlReader); deserial = (TRequest) deserializer.Deserialize(xmlReader);

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

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

2
OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
View File

@ -125,7 +125,7 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
using(XmlTextReader sr = new XmlTextReader(s)) using(XmlTextReader sr = new XmlTextReader(s))
{ {
sr.ProhibitDtd = true; sr.ProhibitDtd = true;
sr.XmlResolver = null;
sr.ReadStartElement("BakedAppearance"); sr.ReadStartElement("BakedAppearance");
while(sr.LocalName == "BakedTexture") while(sr.LocalName == "BakedTexture")
{ {

1
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@ -1131,7 +1131,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None);
XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context); XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context);
xtr.ProhibitDtd = true; xtr.ProhibitDtd = true;
xtr.XmlResolver = null;
// Loaded metadata will be empty if no information exists in the archive // Loaded metadata will be empty if no information exists in the archive
dearchivedScenes.LoadedCreationDateTime = 0; dearchivedScenes.LoadedCreationDateTime = 0;

1
OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
View File

@ -94,7 +94,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
StringReader sr = new StringReader(xml); StringReader sr = new StringReader(xml);
XmlTextReader reader = new XmlTextReader(sr); XmlTextReader reader = new XmlTextReader(sr);
reader.ProhibitDtd = true; reader.ProhibitDtd = true;
reader.XmlResolver = null;
reader.ReadStartElement("assets"); reader.ReadStartElement("assets");
reader.Read(); reader.Read();

4
OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
View File

@ -721,7 +721,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
XmlTextReader xtr = new XmlTextReader(new StringReader(xml)); XmlTextReader xtr = new XmlTextReader(new StringReader(xml));
xtr.ProhibitDtd = true; xtr.ProhibitDtd = true;
xtr.XmlResolver = null;
xtr.ReadStartElement("SceneObjectGroup"); xtr.ReadStartElement("SceneObjectGroup");
xtr.ReadStartElement("RootPart"); xtr.ReadStartElement("RootPart");
xtr.ReadStartElement("SceneObjectPart"); xtr.ReadStartElement("SceneObjectPart");
@ -834,7 +834,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
XmlTextReader xtr = new XmlTextReader(new StringReader(xml2)); XmlTextReader xtr = new XmlTextReader(new StringReader(xml2));
xtr.ProhibitDtd = true; xtr.ProhibitDtd = true;
xtr.XmlResolver = null;
xtr.ReadStartElement("SceneObjectGroup"); xtr.ReadStartElement("SceneObjectGroup");
xtr.ReadStartElement("SceneObjectPart"); xtr.ReadStartElement("SceneObjectPart");

2
OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
using (XmlTextReader reader = new XmlTextReader(path)) using (XmlTextReader reader = new XmlTextReader(path))
{ {
reader.ProhibitDtd = true; reader.ProhibitDtd = true;
// reader.XmlResolver = null;
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver = null; doc.XmlResolver = null;

1
OpenSim/Region/Framework/Scenes/SOPVehicle.cs
View File

@ -594,7 +594,6 @@ namespace OpenSim.Region.Framework.Scenes
MemoryStream ms = new MemoryStream(enc.GetBytes(text)); MemoryStream ms = new MemoryStream(enc.GetBytes(text));
XmlTextReader xreader = new XmlTextReader(ms); XmlTextReader xreader = new XmlTextReader(ms);
xreader.ProhibitDtd = true; xreader.ProhibitDtd = true;
xreader.XmlResolver = null;
SOPVehicle v = new SOPVehicle(); SOPVehicle v = new SOPVehicle();
bool error; bool error;

2
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -2389,7 +2389,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null)) 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 }))
{ {
reader.Read(); reader.Read();
bool isSingleObject = reader.Name != "CoalescedObject"; bool isSingleObject = reader.Name != "CoalescedObject";

2
OpenSim/Region/Framework/Scenes/TerrainChannel.cs
View File

@ -201,7 +201,7 @@ namespace OpenSim.Region.Framework.Scenes
using(XmlTextReader reader = new XmlTextReader(sr)) using(XmlTextReader reader = new XmlTextReader(sr))
{ {
reader.ProhibitDtd = true; reader.ProhibitDtd = true;
reader.XmlResolver = null;
ReadXml(reader); ReadXml(reader);
} }
} }

1
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
View File

@ -1149,7 +1149,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
using (XmlTextReader rdr = new XmlTextReader(s)) using (XmlTextReader rdr = new XmlTextReader(s))
{ {
rdr.ProhibitDtd = true; rdr.ProhibitDtd = true;
rdr.XmlResolver = null;
doc.Load(rdr); doc.Load(rdr);
} }
} }