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

remove more xml things no longer needed on .net >4.5.2

httptests
UbitUmarov 2018-01-17 07:17:24 +00:00
parent e9d2d81880
commit 707eb8de82
18 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs
View File

@ -93,7 +93,6 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " + m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
xmlSource.Length); xmlSource.Length);
XmlDocument xmlDoc = new XmlDocument(); XmlDocument xmlDoc = new XmlDocument();
xmlDoc.XmlResolver = null;
xmlDoc.LoadXml(xmlSource); xmlDoc.LoadXml(xmlSource);
if (xmlDoc.FirstChild.Name == "Nini") if (xmlDoc.FirstChild.Name == "Nini")
{ {

1
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -3138,7 +3138,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
if (File.Exists(defaultAppearanceFileName)) if (File.Exists(defaultAppearanceFileName))
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
string name = "*unknown*"; string name = "*unknown*";
string email = "anon@anon"; string email = "anon@anon";
uint regionXLocation = 1000; uint regionXLocation = 1000;

2
OpenSim/ConsoleClient/ConsoleClient.cs
View File

@ -110,7 +110,6 @@ namespace OpenSim.ConsoleClient
public static void LoginReply(string requestUrl, string requestData, string replyData) public static void LoginReply(string requestUrl, string requestData, string replyData)
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(replyData); doc.LoadXml(replyData);
@ -170,7 +169,6 @@ namespace OpenSim.ConsoleClient
public static void ReadResponses(string requestUrl, string requestData, string replyData) public static void ReadResponses(string requestUrl, string requestData, string replyData)
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(replyData); doc.LoadXml(replyData);

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

@ -156,7 +156,7 @@ namespace OpenSim.Framework.Serialization.External
return xml; return xml;
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xml); doc.LoadXml(xml);
XmlNodeList sops = doc.GetElementsByTagName("SceneObjectPart"); XmlNodeList sops = doc.GetElementsByTagName("SceneObjectPart");

2
OpenSim/Framework/Util.cs
View File

@ -671,7 +671,7 @@ namespace OpenSim.Framework
public static string GetFormattedXml(string rawXml) public static string GetFormattedXml(string rawXml)
{ {
XmlDocument xd = new XmlDocument(); XmlDocument xd = new XmlDocument();
xd.XmlResolver=null;
xd.LoadXml(rawXml); xd.LoadXml(rawXml);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();

1
OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
View File

@ -93,7 +93,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID); Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID);
string xmlData = Utils.BytesToString(ncAssetGet.Data); string xmlData = Utils.BytesToString(ncAssetGet.Data);
XmlDocument ncAssetGetXmlDoc = new XmlDocument(); XmlDocument ncAssetGetXmlDoc = new XmlDocument();
ncAssetGetXmlDoc.XmlResolver=null;
ncAssetGetXmlDoc.LoadXml(xmlData); ncAssetGetXmlDoc.LoadXml(xmlData);
// Console.WriteLine(ncAssetGetXmlDoc.OuterXml); // Console.WriteLine(ncAssetGetXmlDoc.OuterXml);

1
OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
View File

@ -69,7 +69,6 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
MemoryStream stream = new MemoryStream(); MemoryStream stream = new MemoryStream();
XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8); XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xmlstream); doc.LoadXml(xmlstream);
formatter.Formatting = Formatting.Indented; formatter.Formatting = Formatting.Indented;
doc.WriteContentTo(formatter); doc.WriteContentTo(formatter);

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

@ -59,8 +59,6 @@ namespace OpenSim.Region.Framework.Scenes.Animation
using (XmlTextReader reader = new XmlTextReader(path)) using (XmlTextReader reader = new XmlTextReader(path))
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver = null;
doc.Load(reader); doc.Load(reader);
// if (doc.DocumentElement != null) // if (doc.DocumentElement != null)
// { // {

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

@ -2420,7 +2420,6 @@ namespace OpenSim.Region.Framework.Scenes
else else
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xmlData); doc.LoadXml(xmlData);
XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject"); XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
XmlElement coll = (XmlElement)e; XmlElement coll = (XmlElement)e;

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

@ -505,7 +505,6 @@ namespace OpenSim.Region.Framework.Scenes
foreach (KeyValuePair<UUID, string> state in states) foreach (KeyValuePair<UUID, string> state in states)
{ {
XmlDocument sdoc = new XmlDocument(); XmlDocument sdoc = new XmlDocument();
sdoc.XmlResolver=null;
sdoc.LoadXml(state.Value); sdoc.LoadXml(state.Value);
XmlNodeList rootL = sdoc.GetElementsByTagName("State"); XmlNodeList rootL = sdoc.GetElementsByTagName("State");
XmlNode rootNode = rootL[0]; XmlNode rootNode = rootL[0];
@ -541,7 +540,6 @@ namespace OpenSim.Region.Framework.Scenes
return; return;
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
try try
{ {
doc.LoadXml(objXMLData); doc.LoadXml(objXMLData);

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

@ -455,7 +455,6 @@ namespace OpenSim.Region.Framework.Scenes
if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID)) if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID))
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]); doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]);
////////// CRUFT WARNING /////////////////////////////////// ////////// CRUFT WARNING ///////////////////////////////////

1
OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
View File

@ -147,7 +147,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
} }
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xml); doc.LoadXml(xml);
XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject"); XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
if (e == null) if (e == null)

1
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@ -255,7 +255,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
try try
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xmlData); doc.LoadXml(xmlData);
XmlNodeList parts = doc.GetElementsByTagName("SceneObjectPart"); XmlNodeList parts = doc.GetElementsByTagName("SceneObjectPart");

1
OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
View File

@ -49,7 +49,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
public static void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, Vector3 loadOffset) public static void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, Vector3 loadOffset)
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
XmlNode rootNode; XmlNode rootNode;
if (fileName.StartsWith("http:") || File.Exists(fileName)) if (fileName.StartsWith("http:") || File.Exists(fileName))

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

@ -1125,7 +1125,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
return null; return null;
doc = new XmlDocument(); doc = new XmlDocument();
doc.XmlResolver = null;
// Let's serialize all calls to Vivox. Most of these are driven by // Let's serialize all calls to Vivox. Most of these are driven by
// the clients (CAPs), when the user arrives at the region. We don't // the clients (CAPs), when the user arrives at the region. We don't

1
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
View File

@ -207,7 +207,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public static void Deserialize(string xml, ScriptInstance instance) public static void Deserialize(string xml, ScriptInstance instance)
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
Dictionary<string, object> vars = instance.GetVars(); Dictionary<string, object> vars = instance.GetVars();

3
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -2098,7 +2098,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
string xml = instance.GetXMLState(); string xml = instance.GetXMLState();
XmlDocument sdoc = new XmlDocument(); XmlDocument sdoc = new XmlDocument();
sdoc.XmlResolver=null;
bool loadedState = true; bool loadedState = true;
try try
{ {
@ -2254,7 +2254,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return false; return false;
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
try try
{ {

2
OpenSim/Server/Base/ServerUtils.cs
View File

@ -513,7 +513,7 @@ namespace OpenSim.Server.Base
Dictionary<string, object> ret = new Dictionary<string, object>(); Dictionary<string, object> ret = new Dictionary<string, object>();
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver = null;
try try
{ {
doc.LoadXml(data); doc.LoadXml(data);