disable some XmlResolver

3 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 5bca482..9f52a14 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -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);
                     }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
index 8f12331..01c5d3b 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs
@@ -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);
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
index 65f464a..52a80d6 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
@@ -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);