OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
Tom Grimshaw 2010-05-19 00:21:38 -07:00
parent ba36c62caa 55f124745f
commit 71a95900fd
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
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;

2
OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
View File

@ -158,7 +158,7 @@ namespace OpenSim.Services.Connectors.Friends
} }
catch (Exception e) catch (Exception e)
{ {
m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting remote sim: {0}", e.Message); m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting remote sim: {0}", e.ToString());
} }
return false; return false;

4
bin/OpenSim.ini.example
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