Merge branch 'master' of /var/git/opensim/

3 files changed, 15 insertions, 1 deletions

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 72ac303..854307c 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -116,7 +116,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     int port = m_config.GetInt("port", 0);
 
                     m_application = openSim;
-                    m_httpServer = MainServer.GetHttpServer((uint)port);
+                    string bind_ip_address = m_config.GetString("bind_ip_address", "0.0.0.0");
+                    IPAddress ipaddr = IPAddress.Parse( bind_ip_address );
+                    m_httpServer = MainServer.GetHttpServer((uint)port,ipaddr);
 
                     Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>();
                     availableMethods["admin_create_region"] = XmlRpcCreateRegionMethod;
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs
index 1f5f208..8ccabec 100644
--- a/OpenSim/Framework/MainServer.cs
+++ b/OpenSim/Framework/MainServer.cs
@@ -27,6 +27,7 @@
 
 using System.Collections.Generic;
 using System.Reflection;
+using System.Net;
 using log4net;
 using OpenSim.Framework.Servers.HttpServer;
 
@@ -48,6 +49,11 @@ namespace OpenSim.Framework
 
         public static IHttpServer GetHttpServer(uint port)
         {
+            return GetHttpServer(port,null);
+        }
+
+        public static IHttpServer GetHttpServer(uint port, IPAddress ipaddr)
+        {
             if (port == 0)
                 return Instance;
             if (instance != null && port == Instance.Port)
@@ -58,6 +64,9 @@ namespace OpenSim.Framework
 
             m_Servers[port] = new BaseHttpServer(port);
 
+            if (ipaddr != null ) 
+                m_Servers[port].ListenIPAddress = ipaddr; 
+
             m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port);
             m_Servers[port].Start();
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index de7c44c..f98689b 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -624,6 +624,9 @@
     ; Set this to a nonzero value to have remote admin use a different port
     port = 0
 
+    ; Set this to the ip address that you want the admin server to bind to
+    bind_ip_address = "0.0.0.0"
+
     ; This password is required to make any XMLRPC call (should be set as the "password" parameter)
     access_password = unknown