aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorDiva Canto2009-09-23 15:40:35 -0700
committerDiva Canto2009-09-23 15:40:35 -0700
commitb8f039897b83a59b723d9c76b796fee5497afbf1 (patch)
tree05a586e6eea1ee4d23a456d0bcf7f00a321585b1 /OpenSim/Grid
parentModules active. Tested HGGridConnector in standalone only for now. Modules co... (diff)
parentFix endlines on UrlModule.cs (diff)
downloadopensim-SC_OLD-b8f039897b83a59b723d9c76b796fee5497afbf1.zip
opensim-SC_OLD-b8f039897b83a59b723d9c76b796fee5497afbf1.tar.gz
opensim-SC_OLD-b8f039897b83a59b723d9c76b796fee5497afbf1.tar.bz2
opensim-SC_OLD-b8f039897b83a59b723d9c76b796fee5497afbf1.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index baf0fd3..a92226d 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -260,8 +260,6 @@ namespace OpenSim.Grid.UserServer
260 m_userManager.PostInitialise(); 260 m_userManager.PostInitialise();
261 m_avatarAppearanceModule.PostInitialise(); 261 m_avatarAppearanceModule.PostInitialise();
262 m_friendsModule.PostInitialise(); 262 m_friendsModule.PostInitialise();
263
264 m_avatarAppearanceModule.PostInitialise();
265 } 263 }
266 264
267 protected virtual void RegisterHttpHandlers() 265 protected virtual void RegisterHttpHandlers()
@@ -276,8 +274,6 @@ namespace OpenSim.Grid.UserServer
276 m_avatarAppearanceModule.RegisterHandlers(m_httpServer); 274 m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
277 m_messagesService.RegisterHandlers(m_httpServer); 275 m_messagesService.RegisterHandlers(m_httpServer);
278 m_gridInfoService.RegisterHandlers(m_httpServer); 276 m_gridInfoService.RegisterHandlers(m_httpServer);
279
280 m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
281 } 277 }
282 278
283 public override void ShutdownSpecific() 279 public override void ShutdownSpecific()