More Grid server refactoring

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
          private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

 

         private GridDBService m_gridDBService;

-        private IGridCore m_gridCore;

+        private IUGAIMCore m_gridCore;

 

         protected GridConfig m_config;

 

@@ -66,12 +66,23 @@ namespace OpenSim.Grid.GridServer
         {

         }

 

-        public void Initialise(string opensimVersion, GridDBService gridDBService, IGridCore gridCore, GridConfig config)

+        public void Initialise(string opensimVersion, GridDBService gridDBService, IUGAIMCore gridCore, GridConfig config)

         {

             m_opensimVersion = opensimVersion;

             m_gridDBService = gridDBService;

             m_gridCore = gridCore;

             m_config = config;

+            RegisterHandlers();

+        }

+

+        public void PostInitialise()

+        {

+

+        }

+

+        public void RegisterHandlers()

+        {

+            //have these in separate method as some servers restart the http server and reregister all the handlers.

             m_httpServer = m_gridCore.GetHttpServer();

 

             m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", RestGetSimMethod));