aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs1
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs1
-rw-r--r--OpenSim/ConsoleClient/ConsoleClient.cs2
-rw-r--r--OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs1
-rw-r--r--OpenSim/Framework/Util.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs1
-rwxr-xr-xOpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs2
17 files changed, 23 insertions, 5 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs
index 13d7a8a..2b91fc5 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs
@@ -93,6 +93,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
93 m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " + 93 m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
94 xmlSource.Length); 94 xmlSource.Length);
95 XmlDocument xmlDoc = new XmlDocument(); 95 XmlDocument xmlDoc = new XmlDocument();
96 xmlDoc.XmlResolver = null;
96 xmlDoc.LoadXml(xmlSource); 97 xmlDoc.LoadXml(xmlSource);
97 if (xmlDoc.FirstChild.Name == "Nini") 98 if (xmlDoc.FirstChild.Name == "Nini")
98 { 99 {
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 510905f..84d87f1 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -3138,6 +3138,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
3138 if (File.Exists(defaultAppearanceFileName)) 3138 if (File.Exists(defaultAppearanceFileName))
3139 { 3139 {
3140 XmlDocument doc = new XmlDocument(); 3140 XmlDocument doc = new XmlDocument();
3141 doc.XmlResolver=null;
3141 string name = "*unknown*"; 3142 string name = "*unknown*";
3142 string email = "anon@anon"; 3143 string email = "anon@anon";
3143 uint regionXLocation = 1000; 3144 uint regionXLocation = 1000;
diff --git a/OpenSim/ConsoleClient/ConsoleClient.cs b/OpenSim/ConsoleClient/ConsoleClient.cs
index e689424..c395cd7 100644
--- a/OpenSim/ConsoleClient/ConsoleClient.cs
+++ b/OpenSim/ConsoleClient/ConsoleClient.cs
@@ -110,6 +110,7 @@ namespace OpenSim.ConsoleClient
110 public static void LoginReply(string requestUrl, string requestData, string replyData) 110 public static void LoginReply(string requestUrl, string requestData, string replyData)
111 { 111 {
112 XmlDocument doc = new XmlDocument(); 112 XmlDocument doc = new XmlDocument();
113 doc.XmlResolver=null;
113 114
114 doc.LoadXml(replyData); 115 doc.LoadXml(replyData);
115 116
@@ -169,6 +170,7 @@ namespace OpenSim.ConsoleClient
169 public static void ReadResponses(string requestUrl, string requestData, string replyData) 170 public static void ReadResponses(string requestUrl, string requestData, string replyData)
170 { 171 {
171 XmlDocument doc = new XmlDocument(); 172 XmlDocument doc = new XmlDocument();
173 doc.XmlResolver=null;
172 174
173 doc.LoadXml(replyData); 175 doc.LoadXml(replyData);
174 176
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index 1523fa9..d2ca049 100644
--- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
+++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
@@ -156,6 +156,7 @@ namespace OpenSim.Framework.Serialization.External
156 return xml; 156 return xml;
157 157
158 XmlDocument doc = new XmlDocument(); 158 XmlDocument doc = new XmlDocument();
159 doc.XmlResolver=null;
159 doc.LoadXml(xml); 160 doc.LoadXml(xml);
160 XmlNodeList sops = doc.GetElementsByTagName("SceneObjectPart"); 161 XmlNodeList sops = doc.GetElementsByTagName("SceneObjectPart");
161 162
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index a42dcc6..7093010 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -671,6 +671,7 @@ namespace OpenSim.Framework
671 public static string GetFormattedXml(string rawXml) 671 public static string GetFormattedXml(string rawXml)
672 { 672 {
673 XmlDocument xd = new XmlDocument(); 673 XmlDocument xd = new XmlDocument();
674 xd.XmlResolver=null;
674 xd.LoadXml(rawXml); 675 xd.LoadXml(rawXml);
675 676
676 StringBuilder sb = new StringBuilder(); 677 StringBuilder sb = new StringBuilder();
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
306 m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name); 306 m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name);
307 307
308 XmlDocument doc = new XmlDocument(); 308 XmlDocument doc = new XmlDocument();
309 doc.XmlResolver=null;
309 string stateData = String.Empty; 310 string stateData = String.Empty;
310 311
311 IAttachmentsService attServ = m_scene.RequestModuleInterface<IAttachmentsService>(); 312 IAttachmentsService attServ = m_scene.RequestModuleInterface<IAttachmentsService>();
@@ -372,6 +373,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
372 if (itemData.TryGetValue(attach.ItemID, out xmlData)) 373 if (itemData.TryGetValue(attach.ItemID, out xmlData))
373 { 374 {
374 d = new XmlDocument(); 375 d = new XmlDocument();
376 d.XmlResolver=null;
375 d.LoadXml(xmlData); 377 d.LoadXml(xmlData);
376 m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", attach.ItemID); 378 m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", attach.ItemID);
377 } 379 }
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
93 Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID); 93 Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID);
94 string xmlData = Utils.BytesToString(ncAssetGet.Data); 94 string xmlData = Utils.BytesToString(ncAssetGet.Data);
95 XmlDocument ncAssetGetXmlDoc = new XmlDocument(); 95 XmlDocument ncAssetGetXmlDoc = new XmlDocument();
96 ncAssetGetXmlDoc.XmlResolver=null;
96 ncAssetGetXmlDoc.LoadXml(xmlData); 97 ncAssetGetXmlDoc.LoadXml(xmlData);
97 98
98// Console.WriteLine(ncAssetGetXmlDoc.OuterXml); 99// 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
69 MemoryStream stream = new MemoryStream(); 69 MemoryStream stream = new MemoryStream();
70 XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8); 70 XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
71 XmlDocument doc = new XmlDocument(); 71 XmlDocument doc = new XmlDocument();
72 72 doc.XmlResolver=null;
73 doc.LoadXml(xmlstream); 73 doc.LoadXml(xmlstream);
74 formatter.Formatting = Formatting.Indented; 74 formatter.Formatting = Formatting.Indented;
75 doc.WriteContentTo(formatter); 75 doc.WriteContentTo(formatter);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index f29cdf4..71c8807 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2420,6 +2420,7 @@ namespace OpenSim.Region.Framework.Scenes
2420 else 2420 else
2421 { 2421 {
2422 XmlDocument doc = new XmlDocument(); 2422 XmlDocument doc = new XmlDocument();
2423 doc.XmlResolver=null;
2423 doc.LoadXml(xmlData); 2424 doc.LoadXml(xmlData);
2424 XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject"); 2425 XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
2425 XmlElement coll = (XmlElement)e; 2426 XmlElement coll = (XmlElement)e;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index bf217a5..c20c81d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -505,6 +505,7 @@ namespace OpenSim.Region.Framework.Scenes
505 foreach (KeyValuePair<UUID, string> state in states) 505 foreach (KeyValuePair<UUID, string> state in states)
506 { 506 {
507 XmlDocument sdoc = new XmlDocument(); 507 XmlDocument sdoc = new XmlDocument();
508 sdoc.XmlResolver=null;
508 sdoc.LoadXml(state.Value); 509 sdoc.LoadXml(state.Value);
509 XmlNodeList rootL = sdoc.GetElementsByTagName("State"); 510 XmlNodeList rootL = sdoc.GetElementsByTagName("State");
510 XmlNode rootNode = rootL[0]; 511 XmlNode rootNode = rootL[0];
@@ -540,6 +541,7 @@ namespace OpenSim.Region.Framework.Scenes
540 return; 541 return;
541 542
542 XmlDocument doc = new XmlDocument(); 543 XmlDocument doc = new XmlDocument();
544 doc.XmlResolver=null;
543 try 545 try
544 { 546 {
545 doc.LoadXml(objXMLData); 547 doc.LoadXml(objXMLData);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 3380191..21311b0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1994,6 +1994,7 @@ namespace OpenSim.Region.Framework.Scenes
1994 public void SaveScriptedState(XmlTextWriter writer, bool oldIDs) 1994 public void SaveScriptedState(XmlTextWriter writer, bool oldIDs)
1995 { 1995 {
1996 XmlDocument doc = new XmlDocument(); 1996 XmlDocument doc = new XmlDocument();
1997 doc.XmlResolver=null;
1997 Dictionary<UUID,string> states = new Dictionary<UUID,string>(); 1998 Dictionary<UUID,string> states = new Dictionary<UUID,string>();
1998 1999
1999 SceneObjectPart[] parts = m_parts.GetArray(); 2000 SceneObjectPart[] parts = m_parts.GetArray();
@@ -2782,7 +2783,7 @@ namespace OpenSim.Region.Framework.Scenes
2782 return RootPart.Torque; 2783 return RootPart.Torque;
2783 } 2784 }
2784 2785
2785 // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object 2786 // This is used by llMoveToTarget() in an attached object
2786 public void MoveToTarget(Vector3 target, float tau) 2787 public void MoveToTarget(Vector3 target, float tau)
2787 { 2788 {
2788 if (IsAttachment) 2789 if (IsAttachment)
@@ -2790,7 +2791,7 @@ namespace OpenSim.Region.Framework.Scenes
2790 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar); 2791 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
2791 2792
2792 if (avatar != null) 2793 if (avatar != null)
2793 avatar.MoveToTarget(target, false, false); 2794 avatar.MoveToTarget(target, false, false, tau);
2794 } 2795 }
2795 else 2796 else
2796 { 2797 {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index de9d986..30f7151 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -455,7 +455,7 @@ namespace OpenSim.Region.Framework.Scenes
455 if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID)) 455 if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID))
456 { 456 {
457 XmlDocument doc = new XmlDocument(); 457 XmlDocument doc = new XmlDocument();
458 458 doc.XmlResolver=null;
459 doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]); 459 doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]);
460 460
461 ////////// CRUFT WARNING /////////////////////////////////// 461 ////////// CRUFT WARNING ///////////////////////////////////
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index 41f3ef4..a93782e 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -147,6 +147,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
147 } 147 }
148 148
149 XmlDocument doc = new XmlDocument(); 149 XmlDocument doc = new XmlDocument();
150 doc.XmlResolver=null;
150 doc.LoadXml(xml); 151 doc.LoadXml(xml);
151 XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject"); 152 XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
152 if (e == null) 153 if (e == null)
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 82bbe6f..948c345 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -255,6 +255,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
255 try 255 try
256 { 256 {
257 XmlDocument doc = new XmlDocument(); 257 XmlDocument doc = new XmlDocument();
258 doc.XmlResolver=null;
258 doc.LoadXml(xmlData); 259 doc.LoadXml(xmlData);
259 260
260 XmlNodeList parts = doc.GetElementsByTagName("SceneObjectPart"); 261 XmlNodeList parts = doc.GetElementsByTagName("SceneObjectPart");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
index bcdc7bf..cfe21fc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
@@ -207,6 +207,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
207 public static void Deserialize(string xml, ScriptInstance instance) 207 public static void Deserialize(string xml, ScriptInstance instance)
208 { 208 {
209 XmlDocument doc = new XmlDocument(); 209 XmlDocument doc = new XmlDocument();
210 doc.XmlResolver=null;
210 211
211 Dictionary<string, object> vars = instance.GetVars(); 212 Dictionary<string, object> vars = instance.GetVars();
212 213
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 65ce61d..05124fc 100755
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -2098,6 +2098,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
2098 string xml = instance.GetXMLState(); 2098 string xml = instance.GetXMLState();
2099 2099
2100 XmlDocument sdoc = new XmlDocument(); 2100 XmlDocument sdoc = new XmlDocument();
2101 sdoc.XmlResolver=null;
2101 bool loadedState = true; 2102 bool loadedState = true;
2102 try 2103 try
2103 { 2104 {
@@ -2253,6 +2254,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
2253 return false; 2254 return false;
2254 2255
2255 XmlDocument doc = new XmlDocument(); 2256 XmlDocument doc = new XmlDocument();
2257 doc.XmlResolver=null;
2256 2258
2257 try 2259 try
2258 { 2260 {
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index d0043ba..cc506bc 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -513,7 +513,7 @@ namespace OpenSim.Server.Base
513 Dictionary<string, object> ret = new Dictionary<string, object>(); 513 Dictionary<string, object> ret = new Dictionary<string, object>();
514 514
515 XmlDocument doc = new XmlDocument(); 515 XmlDocument doc = new XmlDocument();
516 516 doc.XmlResolver = null;
517 try 517 try
518 { 518 {
519 doc.LoadXml(data); 519 doc.LoadXml(data);