Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge

Conflicts:
	OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs

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;
 using OpenSim;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
@@ -67,7 +66,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         private IConfig m_config;
         private IConfigSource m_configSource;
         private string m_requiredPassword = String.Empty;
-        private List<string> m_accessIP;
+        private HashSet<string> m_accessIP;
 
         private string m_name = "RemoteAdminPlugin";
         private string m_version = "0.0";
@@ -106,7 +105,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     int port = m_config.GetInt("port", 0);
 
                     string accessIP = m_config.GetString("access_ip_addresses", String.Empty);
-                    m_accessIP = new List<string>();
+                    m_accessIP = new HashSet<string>();
                     if (accessIP != String.Empty)
                     {
                         string[] ips = accessIP.Split(new char[] { ',' });
@@ -288,6 +287,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     restartModule.ScheduleRestart(UUID.Zero, message, times.ToArray(), notice);
                     responseData["success"] = true;
                 }
+
                 response.Value = responseData;
             }
             catch (Exception e)
@@ -960,7 +960,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         public XmlRpcResponse XmlRpcDeleteRegionMethod(XmlRpcRequest request, IPEndPoint remoteClient)
         {
             m_log.Info("[RADMIN]: DeleteRegion: new request");
-            
+
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
@@ -3305,4 +3305,4 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/prebuild.xml b/prebuild.xml
index abd2fa0..3b4ea39 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1907,6 +1907,7 @@
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="Mono.Addins" path="../../../bin/"/>
       <Reference name="System"/>
+      <Reference name="System.Core"/>
       <Reference name="System.Xml"/>
       <Reference name="OpenMetaverse" path="../../../bin/"/>
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>