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

useless ms xml things

Browse Source
This commit is contained in:
UbitUmarov
2021-12-14 16:04:45 +00:00
parent da4d4149f0
commit a0e039e876
21 changed files with 67 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/PhysicsInertia.cs
View File

@@ -191,12 +191,14 @@ namespace OpenSim.Framework
PhysicsInertiaData v;
UTF8Encoding enc = new UTF8Encoding();
using(MemoryStream ms = new MemoryStream(enc.GetBytes(text)))
{
using(XmlTextReader xreader = new XmlTextReader(ms))
{
xreader.DtdProcessing = DtdProcessing.Ignore;
v = new PhysicsInertiaData();
v.FromXml2(xreader, out error);
}
}
if (error)
return null;

1
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@@ -1558,6 +1558,7 @@ namespace OpenSim.Framework
{
using (XmlTextReader xtr = new XmlTextReader(sr))
{
xtr.DtdProcessing = DtdProcessing.Ignore;
xtr.MoveToContent();
string type = xtr.GetAttribute("type");

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

@@ -30,6 +30,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using System.Text;
using System.Xml;
using log4net;
using OpenMetaverse;
@@ -221,7 +222,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}))
using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Ignore}))
{
TransformXml(reader, writer, sceneName, homeURL, userService, scopeID);

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

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

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

@@ -69,6 +69,7 @@ namespace OpenSim.Framework.Serialization.External
StringReader sr = new StringReader(serializedSettings);
XmlTextReader xtr = new XmlTextReader(sr);
xtr.DtdProcessing = DtdProcessing.Ignore;
xtr.ReadStartElement("RegionSettings");

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

@@ -202,6 +202,7 @@ namespace OpenSim.Framework.Serialization.External
using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization)))
{
reader.DtdProcessing = DtdProcessing.Ignore;
reader.ReadStartElement("InventoryItem");
ExternalRepresentationUtils.ExecuteReadProcessors<InventoryItemBase>(

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

@@ -54,6 +54,7 @@ namespace OpenSim.Framework.Servers.HttpServer
TRequest deserial;
using (XmlTextReader xmlReader = new XmlTextReader(request))
{
xmlReader.DtdProcessing = DtdProcessing.Ignore;
XmlSerializer deserializer = new XmlSerializer(typeof (TRequest));
deserial = (TRequest) deserializer.Deserialize(xmlReader);
}

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

@@ -210,6 +210,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{
try
{
xmlReader.DtdProcessing = DtdProcessing.Ignore;
XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>));
deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader);
}
@@ -269,6 +270,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{
try
{
xmlReader.DtdProcessing = DtdProcessing.Ignore;
XmlSerializer deserializer = new XmlSerializer(typeof(TRequest));
deserial = (TRequest)deserializer.Deserialize(xmlReader);
}