aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorUbitUmarov2018-01-04 23:51:43 +0000
committerUbitUmarov2018-01-04 23:51:43 +0000
commitec6f87d3eff699ca28214629d360c15e5df13156 (patch)
tree2b8678326fa60f63592bfb272c07d0809276e6d9 /OpenSim/Region/CoreModules/Avatar
parentremove some tabs added to config files (diff)
downloadopensim-SC_OLD-ec6f87d3eff699ca28214629d360c15e5df13156.zip
opensim-SC_OLD-ec6f87d3eff699ca28214629d360c15e5df13156.tar.gz
opensim-SC_OLD-ec6f87d3eff699ca28214629d360c15e5df13156.tar.bz2
opensim-SC_OLD-ec6f87d3eff699ca28214629d360c15e5df13156.tar.xz
disable some XmlResolver
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs2
1 files changed, 2 insertions, 0 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
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 }