diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/GridServer/GridRestModule.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Grid/GridServer/GridRestModule.cs b/OpenSim/Grid/GridServer/GridRestModule.cs index d0bcbe8..5894c4b 100644 --- a/OpenSim/Grid/GridServer/GridRestModule.cs +++ b/OpenSim/Grid/GridServer/GridRestModule.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Grid.GridServer | |||
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | private GridDBService m_gridDBService; | 47 | private GridDBService m_gridDBService; |
48 | private IGridCore m_gridCore; | 48 | private IUGAIMCore m_gridCore; |
49 | 49 | ||
50 | protected GridConfig m_config; | 50 | protected GridConfig m_config; |
51 | 51 | ||
@@ -66,12 +66,23 @@ namespace OpenSim.Grid.GridServer | |||
66 | { | 66 | { |
67 | } | 67 | } |
68 | 68 | ||
69 | public void Initialise(string opensimVersion, GridDBService gridDBService, IGridCore gridCore, GridConfig config) | 69 | public void Initialise(string opensimVersion, GridDBService gridDBService, IUGAIMCore gridCore, GridConfig config) |
70 | { | 70 | { |
71 | m_opensimVersion = opensimVersion; | 71 | m_opensimVersion = opensimVersion; |
72 | m_gridDBService = gridDBService; | 72 | m_gridDBService = gridDBService; |
73 | m_gridCore = gridCore; | 73 | m_gridCore = gridCore; |
74 | m_config = config; | 74 | m_config = config; |
75 | RegisterHandlers(); | ||
76 | } | ||
77 | |||
78 | public void PostInitialise() | ||
79 | { | ||
80 | |||
81 | } | ||
82 | |||
83 | public void RegisterHandlers() | ||
84 | { | ||
85 | //have these in separate method as some servers restart the http server and reregister all the handlers. | ||
75 | m_httpServer = m_gridCore.GetHttpServer(); | 86 | m_httpServer = m_gridCore.GetHttpServer(); |
76 | 87 | ||
77 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", RestGetSimMethod)); | 88 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", RestGetSimMethod)); |