ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

disable some XmlResolver

Browse Source
This commit is contained in:
UbitUmarov
2018-01-04 23:51:43 +00:00
parent 7f49364d65
commit ec6f87d3ef
17 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@@ -306,6 +306,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name);
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
string stateData = String.Empty;
IAttachmentsService attServ = m_scene.RequestModuleInterface<IAttachmentsService>();
@@ -372,6 +373,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
if (itemData.TryGetValue(attach.ItemID, out xmlData))
{
d = new XmlDocument();
d.XmlResolver=null;
d.LoadXml(xmlData);
m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", attach.ItemID);
}

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

@@ -93,6 +93,7 @@ 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);

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

@@ -69,7 +69,7 @@ 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);

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

@@ -2420,6 +2420,7 @@ 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,6 +505,7 @@ 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];
@@ -540,6 +541,7 @@ namespace OpenSim.Region.Framework.Scenes
return;
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
try
{
doc.LoadXml(objXMLData);

5
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -1994,6 +1994,7 @@ namespace OpenSim.Region.Framework.Scenes
public void SaveScriptedState(XmlTextWriter writer, bool oldIDs)
{
XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
Dictionary<UUID,string> states = new Dictionary<UUID,string>();
SceneObjectPart[] parts = m_parts.GetArray();
@@ -2782,7 +2783,7 @@ namespace OpenSim.Region.Framework.Scenes
return RootPart.Torque;
}
// This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object
// This is used by llMoveToTarget() in an attached object
public void MoveToTarget(Vector3 target, float tau)
{
if (IsAttachment)
@@ -2790,7 +2791,7 @@ namespace OpenSim.Region.Framework.Scenes
ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
if (avatar != null)
avatar.MoveToTarget(target, false, false);
avatar.MoveToTarget(target, false, false, tau);
}
else
{

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

@@ -455,7 +455,7 @@ 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,6 +147,7 @@ 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,6 +255,7 @@ 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/ScriptEngine/Shared/Instance/ScriptSerializer.cs
View File

@@ -207,6 +207,7 @@ 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();

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

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