diff options
| author | MW | 2007-12-03 09:58:25 +0000 |
|---|---|---|
| committer | MW | 2007-12-03 09:58:25 +0000 |
| commit | 9f5e1efc2d2eb9e621e9f517e399acfdefdebeb9 (patch) | |
| tree | 7e44be6684b01a36ea2046aae305ba013efdc955 | |
| parent | Applied patch from mantis issue #110 (with one or two tiny changes) , thanks ... (diff) | |
| download | opensim-SC-9f5e1efc2d2eb9e621e9f517e399acfdefdebeb9.zip opensim-SC-9f5e1efc2d2eb9e621e9f517e399acfdefdebeb9.tar.gz opensim-SC-9f5e1efc2d2eb9e621e9f517e399acfdefdebeb9.tar.bz2 opensim-SC-9f5e1efc2d2eb9e621e9f517e399acfdefdebeb9.tar.xz | |
Added another .ini file error catch to the RemoteAdminPlugin Initialise method.
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 18d5f0c..c37fcba 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -28,18 +28,22 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
| 28 | 28 | ||
| 29 | public void Initialise(OpenSimMain openSim) | 29 | public void Initialise(OpenSimMain openSim) |
| 30 | { | 30 | { |
| 31 | if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false)) | 31 | IConfig remoteConfig = openSim.ConfigSource.Configs["RemoteAdmin"]; |
| 32 | { | 32 | if (remoteConfig != null) |
| 33 | System.Console.WriteLine("RADMIN","Remote Admin Plugin Enabled"); | 33 | { |
| 34 | 34 | if (remoteConfig.GetBoolean("enabled", false)) | |
| 35 | m_app = openSim; | 35 | { |
| 36 | m_httpd = openSim.HttpServer; | 36 | System.Console.WriteLine("RADMIN", "Remote Admin Plugin Enabled"); |
| 37 | 37 | ||
| 38 | m_httpd.AddXmlRPCHandler("admin_create_region", XmlRpcCreateRegionMethod); | 38 | m_app = openSim; |
| 39 | m_httpd.AddXmlRPCHandler("admin_shutdown", XmlRpcShutdownMethod); | 39 | m_httpd = openSim.HttpServer; |
| 40 | m_httpd.AddXmlRPCHandler("admin_broadcast", XmlRpcAlertMethod); | 40 | |
| 41 | m_httpd.AddXmlRPCHandler("admin_restart", XmlRpcRestartMethod); | 41 | m_httpd.AddXmlRPCHandler("admin_create_region", XmlRpcCreateRegionMethod); |
| 42 | } | 42 | m_httpd.AddXmlRPCHandler("admin_shutdown", XmlRpcShutdownMethod); |
| 43 | m_httpd.AddXmlRPCHandler("admin_broadcast", XmlRpcAlertMethod); | ||
| 44 | m_httpd.AddXmlRPCHandler("admin_restart", XmlRpcRestartMethod); | ||
| 45 | } | ||
| 46 | } | ||
| 43 | } | 47 | } |
| 44 | 48 | ||
| 45 | public XmlRpcResponse XmlRpcRestartMethod(XmlRpcRequest request) | 49 | public XmlRpcResponse XmlRpcRestartMethod(XmlRpcRequest request) |