ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
UbitUmarov
2018-01-17 07:17:24 +00:00
parent e9d2d81880
commit 707eb8de82
18 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
string xmlData = Utils.BytesToString(ncAssetGet.Data);
XmlDocument ncAssetGetXmlDoc = new XmlDocument();
ncAssetGetXmlDoc.XmlResolver=null;
ncAssetGetXmlDoc.LoadXml(xmlData);
// 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();
XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xmlstream);
formatter.Formatting = Formatting.Indented;
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))
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver = null;
doc.Load(reader);
// if (doc.DocumentElement != null)
// {

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

@@ -2420,7 +2420,6 @@ namespace OpenSim.Region.Framework.Scenes
else
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xmlData);
XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
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)
{
XmlDocument sdoc = new XmlDocument();
sdoc.XmlResolver=null;
sdoc.LoadXml(state.Value);
XmlNodeList rootL = sdoc.GetElementsByTagName("State");
XmlNode rootNode = rootL[0];
@@ -541,7 +540,6 @@ namespace OpenSim.Region.Framework.Scenes
return;
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
try
{
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))
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]);
////////// 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();
doc.XmlResolver=null;
doc.LoadXml(xml);
XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
if (e == null)

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

@@ -255,7 +255,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
try
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xmlData);
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)
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
XmlNode rootNode;
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;
doc = new XmlDocument();
doc.XmlResolver = null;
// 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

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)
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
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();
XmlDocument sdoc = new XmlDocument();
sdoc.XmlResolver=null;
bool loadedState = true;
try
{
@@ -2254,7 +2254,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return false;
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
try
{