aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorUbitUmarov2018-01-04 23:51:43 +0000
committerUbitUmarov2018-01-04 23:51:43 +0000
commitec6f87d3eff699ca28214629d360c15e5df13156 (patch)
tree2b8678326fa60f63592bfb272c07d0809276e6d9 /OpenSim/ApplicationPlugins
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/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs1
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs1
2 files changed, 2 insertions, 0 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;