aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs1
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs3
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs
index 2b91fc5..13d7a8a 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs
@@ -93,7 +93,6 @@ 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;
97 xmlDoc.LoadXml(xmlSource); 96 xmlDoc.LoadXml(xmlSource);
98 if (xmlDoc.FirstChild.Name == "Nini") 97 if (xmlDoc.FirstChild.Name == "Nini")
99 { 98 {
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 84d87f1..468e7be 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1934,7 +1934,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1934 GetSceneFromRegionParams(requestData, responseData, out scene); 1934 GetSceneFromRegionParams(requestData, responseData, out scene);
1935 health = scene.GetHealth(out flags, out text); 1935 health = scene.GetHealth(out flags, out text);
1936 } 1936 }
1937 catch (Exception e) 1937 catch
1938 { 1938 {
1939 responseData["error"] = null; 1939 responseData["error"] = null;
1940 } 1940 }
@@ -3138,7 +3138,6 @@ 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;
3142 string name = "*unknown*"; 3141 string name = "*unknown*";
3143 string email = "anon@anon"; 3142 string email = "anon@anon";
3144 uint regionXLocation = 1000; 3143 uint regionXLocation = 1000;