diff options
| author | Dr Scofield | 2008-08-22 11:09:38 +0000 |
|---|---|---|
| committer | Dr Scofield | 2008-08-22 11:09:38 +0000 |
| commit | d972d227889beb3b12b937be55fdecab9bdea2e7 (patch) | |
| tree | 9af7cc851644b440a2a6b403d222965713dcb3ee /OpenSim/Region | |
| parent | - fixes a bug in RemoteAdminPlugin where CreateRegion would not pay (diff) | |
| download | opensim-SC_OLD-d972d227889beb3b12b937be55fdecab9bdea2e7.zip opensim-SC_OLD-d972d227889beb3b12b937be55fdecab9bdea2e7.tar.gz opensim-SC_OLD-d972d227889beb3b12b937be55fdecab9bdea2e7.tar.bz2 opensim-SC_OLD-d972d227889beb3b12b937be55fdecab9bdea2e7.tar.xz | |
bug fixes:
- GridInfoServices was not paying attention to location of ini file
- typo in RemoteAdminPlugin
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 983773a..0dd037d 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -387,7 +387,8 @@ namespace OpenSim | |||
| 387 | m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod); | 387 | m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod); |
| 388 | 388 | ||
| 389 | // provide grid info | 389 | // provide grid info |
| 390 | m_gridInfoService = new GridInfoService(); | 390 | // m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini"))); |
| 391 | m_gridInfoService = new GridInfoService(m_config.Source); | ||
| 391 | m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); | 392 | m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); |
| 392 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); | 393 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); |
| 393 | } | 394 | } |