From 49618dc102c42b7125303511d826f76f0ebaab4c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 10 Jan 2010 19:19:34 -0800
Subject: Moved GridInfo service from where it was to Handlers/Grid

---
 OpenSim/Grid/UserServer/Main.cs | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'OpenSim/Grid/UserServer')

diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 5bf728a..d598728 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -66,8 +66,6 @@ namespace OpenSim.Grid.UserServer
         public UserLoginService m_loginService;
         public MessageServersConnector m_messagesService;
 
-        protected GridInfoServiceModule m_gridInfoService;
-
         protected UserServerCommandModule m_consoleCommandModule;
         protected UserServerEventDispatchModule m_eventDispatcher;
 
@@ -213,9 +211,6 @@ namespace OpenSim.Grid.UserServer
 
             m_messagesService = new MessageServersConnector();
             m_messagesService.Initialise(this);
-
-            m_gridInfoService = new GridInfoServiceModule();
-            m_gridInfoService.Initialise(this);
         }
 
         protected virtual void StartOtherComponents(IInterServiceInventoryServices inventoryService)
@@ -252,7 +247,6 @@ namespace OpenSim.Grid.UserServer
             m_userDataBaseService.PostInitialise();
             m_messagesService.PostInitialise();
             m_eventDispatcher.PostInitialise(); //it will register event handlers in here
-            m_gridInfoService.PostInitialise();
             m_userManager.PostInitialise();
             m_avatarAppearanceModule.PostInitialise();
             m_friendsModule.PostInitialise();
@@ -266,7 +260,6 @@ namespace OpenSim.Grid.UserServer
             m_friendsModule.RegisterHandlers(m_httpServer);
             m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
             m_messagesService.RegisterHandlers(m_httpServer);
-            m_gridInfoService.RegisterHandlers(m_httpServer);
         }
 
         public override void ShutdownSpecific()
-- 
cgit v1.1