diff options
author | Melanie Thielker | 2010-05-18 19:25:40 +0200 |
---|---|---|
committer | Melanie | 2010-05-18 17:01:44 +0100 |
commit | 3e1f2ddb8e296a7fef9b7887fa9fda48f4eb2abf (patch) | |
tree | 804ebbc63c2bdc5ab9c49455a7376669e32eca99 /OpenSim/ApplicationPlugins/RemoteController | |
parent | Change an exception reporting to include the stack trace. "e.Message" just (diff) | |
download | opensim-SC_OLD-3e1f2ddb8e296a7fef9b7887fa9fda48f4eb2abf.zip opensim-SC_OLD-3e1f2ddb8e296a7fef9b7887fa9fda48f4eb2abf.tar.gz opensim-SC_OLD-3e1f2ddb8e296a7fef9b7887fa9fda48f4eb2abf.tar.bz2 opensim-SC_OLD-3e1f2ddb8e296a7fef9b7887fa9fda48f4eb2abf.tar.xz |
Allow remote admin to be used on a different port from the main region port
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 5 |
1 files changed, 3 insertions, 2 deletions
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 | |||
63 | private static Object SOLock = new Object(); | 63 | private static Object SOLock = new Object(); |
64 | 64 | ||
65 | private OpenSimBase m_app; | 65 | private OpenSimBase m_app; |
66 | private BaseHttpServer m_httpd; | 66 | private IHttpServer m_httpd; |
67 | private IConfig m_config; | 67 | private IConfig m_config; |
68 | private IConfigSource m_configSource; | 68 | private IConfigSource m_configSource; |
69 | private string m_requiredPassword = String.Empty; | 69 | private string m_requiredPassword = String.Empty; |
@@ -113,9 +113,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
113 | m_config = m_configSource.Configs["RemoteAdmin"]; | 113 | m_config = m_configSource.Configs["RemoteAdmin"]; |
114 | m_log.Info("[RADMIN]: Remote Admin Plugin Enabled"); | 114 | m_log.Info("[RADMIN]: Remote Admin Plugin Enabled"); |
115 | m_requiredPassword = m_config.GetString("access_password", String.Empty); | 115 | m_requiredPassword = m_config.GetString("access_password", String.Empty); |
116 | int port = m_config.GetInt("port", 0); | ||
116 | 117 | ||
117 | m_app = openSim; | 118 | m_app = openSim; |
118 | m_httpd = openSim.HttpServer; | 119 | m_httpd = MainServer.GetHttpServer((uint)port); |
119 | 120 | ||
120 | Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>(); | 121 | Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>(); |
121 | availableMethods["admin_create_region"] = XmlRpcCreateRegionMethod; | 122 | availableMethods["admin_create_region"] = XmlRpcCreateRegionMethod; |