aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2010-05-18 19:25:40 +0200
committerMelanie2010-05-18 17:01:44 +0100
commit3e1f2ddb8e296a7fef9b7887fa9fda48f4eb2abf (patch)
tree804ebbc63c2bdc5ab9c49455a7376669e32eca99
parentChange an exception reporting to include the stack trace. "e.Message" just (diff)
downloadopensim-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.cs5
-rw-r--r--bin/OpenSim.ini.example4
2 files changed, 7 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;
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index a5eb78b..7b427a5 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -591,6 +591,10 @@
591 591
592[RemoteAdmin] 592[RemoteAdmin]
593 enabled = false 593 enabled = false
594
595 ; Set this to a nonzero value to have remote admin use a different port
596 port = 0
597
594 access_password = unknown 598 access_password = unknown
595 599
596 ; set this variable to true if you want the create_region XmlRpc 600 ; set this variable to true if you want the create_region XmlRpc