aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs9
-rw-r--r--prebuild.xml1
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index d26662f..e897f7c 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -41,7 +41,6 @@ using OpenMetaverse;
41using OpenSim; 41using OpenSim;
42using OpenSim.Framework; 42using OpenSim.Framework;
43using OpenSim.Framework.Communications; 43using OpenSim.Framework.Communications;
44
45using OpenSim.Framework.Console; 44using OpenSim.Framework.Console;
46using OpenSim.Framework.Servers; 45using OpenSim.Framework.Servers;
47using OpenSim.Framework.Servers.HttpServer; 46using OpenSim.Framework.Servers.HttpServer;
@@ -67,7 +66,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
67 private IConfig m_config; 66 private IConfig m_config;
68 private IConfigSource m_configSource; 67 private IConfigSource m_configSource;
69 private string m_requiredPassword = String.Empty; 68 private string m_requiredPassword = String.Empty;
70 private List<string> m_accessIP; 69 private HashSet<string> m_accessIP;
71 70
72 private string m_name = "RemoteAdminPlugin"; 71 private string m_name = "RemoteAdminPlugin";
73 private string m_version = "0.0"; 72 private string m_version = "0.0";
@@ -106,7 +105,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
106 int port = m_config.GetInt("port", 0); 105 int port = m_config.GetInt("port", 0);
107 106
108 string accessIP = m_config.GetString("access_ip_addresses", String.Empty); 107 string accessIP = m_config.GetString("access_ip_addresses", String.Empty);
109 m_accessIP = new List<string>(); 108 m_accessIP = new HashSet<string>();
110 if (accessIP != String.Empty) 109 if (accessIP != String.Empty)
111 { 110 {
112 string[] ips = accessIP.Split(new char[] { ',' }); 111 string[] ips = accessIP.Split(new char[] { ',' });
@@ -251,8 +250,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
251 restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true); 250 restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true);
252 responseData["success"] = true; 251 responseData["success"] = true;
253 } 252 }
254 response.Value = responseData;
255 253
254 response.Value = responseData;
256 } 255 }
257 catch (Exception e) 256 catch (Exception e)
258 { 257 {
@@ -857,7 +856,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
857 public XmlRpcResponse XmlRpcDeleteRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) 856 public XmlRpcResponse XmlRpcDeleteRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient)
858 { 857 {
859 m_log.Info("[RADMIN]: DeleteRegion: new request"); 858 m_log.Info("[RADMIN]: DeleteRegion: new request");
860 859
861 XmlRpcResponse response = new XmlRpcResponse(); 860 XmlRpcResponse response = new XmlRpcResponse();
862 Hashtable responseData = new Hashtable(); 861 Hashtable responseData = new Hashtable();
863 862
diff --git a/prebuild.xml b/prebuild.xml
index a204c0f..c2e024a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1876,6 +1876,7 @@
1876 <ReferencePath>../../../bin/</ReferencePath> 1876 <ReferencePath>../../../bin/</ReferencePath>
1877 <Reference name="Mono.Addins" path="../../../bin/"/> 1877 <Reference name="Mono.Addins" path="../../../bin/"/>
1878 <Reference name="System"/> 1878 <Reference name="System"/>
1879 <Reference name="System.Core"/>
1879 <Reference name="System.Xml"/> 1880 <Reference name="System.Xml"/>
1880 <Reference name="OpenMetaverse" path="../../../bin/"/> 1881 <Reference name="OpenMetaverse" path="../../../bin/"/>
1881 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 1882 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>