aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorDiva Canto2010-01-10 19:19:34 -0800
committerDiva Canto2010-01-10 19:19:34 -0800
commit49618dc102c42b7125303511d826f76f0ebaab4c (patch)
treefba3817eb6ee8547914892dbae45c955d78734e8 /OpenSim/Grid/UserServer
parentRemoved refs to OpenIdService in UserServer. (diff)
downloadopensim-SC-49618dc102c42b7125303511d826f76f0ebaab4c.zip
opensim-SC-49618dc102c42b7125303511d826f76f0ebaab4c.tar.gz
opensim-SC-49618dc102c42b7125303511d826f76f0ebaab4c.tar.bz2
opensim-SC-49618dc102c42b7125303511d826f76f0ebaab4c.tar.xz
Moved GridInfo service from where it was to Handlers/Grid
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs7
1 files changed, 0 insertions, 7 deletions
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
66 public UserLoginService m_loginService; 66 public UserLoginService m_loginService;
67 public MessageServersConnector m_messagesService; 67 public MessageServersConnector m_messagesService;
68 68
69 protected GridInfoServiceModule m_gridInfoService;
70
71 protected UserServerCommandModule m_consoleCommandModule; 69 protected UserServerCommandModule m_consoleCommandModule;
72 protected UserServerEventDispatchModule m_eventDispatcher; 70 protected UserServerEventDispatchModule m_eventDispatcher;
73 71
@@ -213,9 +211,6 @@ namespace OpenSim.Grid.UserServer
213 211
214 m_messagesService = new MessageServersConnector(); 212 m_messagesService = new MessageServersConnector();
215 m_messagesService.Initialise(this); 213 m_messagesService.Initialise(this);
216
217 m_gridInfoService = new GridInfoServiceModule();
218 m_gridInfoService.Initialise(this);
219 } 214 }
220 215
221 protected virtual void StartOtherComponents(IInterServiceInventoryServices inventoryService) 216 protected virtual void StartOtherComponents(IInterServiceInventoryServices inventoryService)
@@ -252,7 +247,6 @@ namespace OpenSim.Grid.UserServer
252 m_userDataBaseService.PostInitialise(); 247 m_userDataBaseService.PostInitialise();
253 m_messagesService.PostInitialise(); 248 m_messagesService.PostInitialise();
254 m_eventDispatcher.PostInitialise(); //it will register event handlers in here 249 m_eventDispatcher.PostInitialise(); //it will register event handlers in here
255 m_gridInfoService.PostInitialise();
256 m_userManager.PostInitialise(); 250 m_userManager.PostInitialise();
257 m_avatarAppearanceModule.PostInitialise(); 251 m_avatarAppearanceModule.PostInitialise();
258 m_friendsModule.PostInitialise(); 252 m_friendsModule.PostInitialise();
@@ -266,7 +260,6 @@ namespace OpenSim.Grid.UserServer
266 m_friendsModule.RegisterHandlers(m_httpServer); 260 m_friendsModule.RegisterHandlers(m_httpServer);
267 m_avatarAppearanceModule.RegisterHandlers(m_httpServer); 261 m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
268 m_messagesService.RegisterHandlers(m_httpServer); 262 m_messagesService.RegisterHandlers(m_httpServer);
269 m_gridInfoService.RegisterHandlers(m_httpServer);
270 } 263 }
271 264
272 public override void ShutdownSpecific() 265 public override void ShutdownSpecific()