diff options
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 10 | ||||
-rw-r--r-- | prebuild.xml | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index ba461f0..bcf98a1 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -41,7 +41,6 @@ using OpenMetaverse; | |||
41 | using OpenSim; | 41 | using OpenSim; |
42 | using OpenSim.Framework; | 42 | using OpenSim.Framework; |
43 | using OpenSim.Framework.Communications; | 43 | using OpenSim.Framework.Communications; |
44 | |||
45 | using OpenSim.Framework.Console; | 44 | using OpenSim.Framework.Console; |
46 | using OpenSim.Framework.Servers; | 45 | using OpenSim.Framework.Servers; |
47 | using OpenSim.Framework.Servers.HttpServer; | 46 | using 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[] { ',' }); |
@@ -288,6 +287,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
288 | restartModule.ScheduleRestart(UUID.Zero, message, times.ToArray(), notice); | 287 | restartModule.ScheduleRestart(UUID.Zero, message, times.ToArray(), notice); |
289 | responseData["success"] = true; | 288 | responseData["success"] = true; |
290 | } | 289 | } |
290 | |||
291 | response.Value = responseData; | 291 | response.Value = responseData; |
292 | } | 292 | } |
293 | catch (Exception e) | 293 | catch (Exception e) |
@@ -960,7 +960,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
960 | public XmlRpcResponse XmlRpcDeleteRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) | 960 | public XmlRpcResponse XmlRpcDeleteRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient) |
961 | { | 961 | { |
962 | m_log.Info("[RADMIN]: DeleteRegion: new request"); | 962 | m_log.Info("[RADMIN]: DeleteRegion: new request"); |
963 | 963 | ||
964 | XmlRpcResponse response = new XmlRpcResponse(); | 964 | XmlRpcResponse response = new XmlRpcResponse(); |
965 | Hashtable responseData = new Hashtable(); | 965 | Hashtable responseData = new Hashtable(); |
966 | 966 | ||
@@ -3305,4 +3305,4 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
3305 | } | 3305 | } |
3306 | } | 3306 | } |
3307 | } | 3307 | } |
3308 | } \ No newline at end of file | 3308 | } |
diff --git a/prebuild.xml b/prebuild.xml index abd2fa0..3b4ea39 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1907,6 +1907,7 @@ | |||
1907 | <ReferencePath>../../../bin/</ReferencePath> | 1907 | <ReferencePath>../../../bin/</ReferencePath> |
1908 | <Reference name="Mono.Addins" path="../../../bin/"/> | 1908 | <Reference name="Mono.Addins" path="../../../bin/"/> |
1909 | <Reference name="System"/> | 1909 | <Reference name="System"/> |
1910 | <Reference name="System.Core"/> | ||
1910 | <Reference name="System.Xml"/> | 1911 | <Reference name="System.Xml"/> |
1911 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 1912 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
1912 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 1913 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |