Allow remote admin to be used on a different port from the main region port

avinationmerge
Melanie Thielker 2010-05-18 19:25:40 +02:00
parent 1c3790a70d
commit 55f124745f
2 changed files with 7 additions and 2 deletions

View File

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

View File

@ -594,6 +594,10 @@
[RemoteAdmin] [RemoteAdmin]
enabled = false enabled = false
; Set this to a nonzero value to have remote admin use a different port
port = 0
access_password = unknown access_password = unknown
; set this variable to true if you want the create_region XmlRpc ; set this variable to true if you want the create_region XmlRpc