From 3e1f2ddb8e296a7fef9b7887fa9fda48f4eb2abf Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 18 May 2010 19:25:40 +0200
Subject: Allow remote admin to be used on a different port from the main
 region port

---
 OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index c5346d4..7ebb5de 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -63,7 +63,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         private static Object   SOLock = new Object();
 
         private OpenSimBase m_app;
-        private BaseHttpServer m_httpd;
+        private IHttpServer m_httpd;
         private IConfig m_config;
         private IConfigSource m_configSource;
         private string m_requiredPassword = String.Empty;
@@ -113,9 +113,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     m_config = m_configSource.Configs["RemoteAdmin"];
                     m_log.Info("[RADMIN]: Remote Admin Plugin Enabled");
                     m_requiredPassword = m_config.GetString("access_password", String.Empty);
+                    int port = m_config.GetInt("port", 0);
 
                     m_app = openSim;
-                    m_httpd = openSim.HttpServer;
+                    m_httpd = MainServer.GetHttpServer((uint)port);
 
                     Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>();
                     availableMethods["admin_create_region"] = XmlRpcCreateRegionMethod;
-- 
cgit v1.1