ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +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

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))
{
reader.ProhibitDtd = true;
// reader.XmlResolver = null;
XmlDocument doc = new XmlDocument();
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));
XmlTextReader xreader = new XmlTextReader(ms);
xreader.ProhibitDtd = true;
xreader.XmlResolver = null;
SOPVehicle v = new SOPVehicle();
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 (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();
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))
{
reader.ProhibitDtd = true;
reader.XmlResolver = null;
ReadXml(reader);
}
}