diff options
| author | Kitto Flora | 2009-09-30 19:07:18 +0200 |
|---|---|---|
| committer | Kitto Flora | 2009-09-30 19:07:18 +0200 |
| commit | 07df0e0ab0c69633a6afec8d05cccc117656d3d9 (patch) | |
| tree | 3048cc38b313e255cbf03fa3e2900e28cadc47c9 /OpenSim/Grid/UserServer/Main.cs | |
| parent | And another merge issue (diff) | |
| parent | Fix loading modules with alternate configurations and ports into ROBUST. (diff) | |
| download | opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.zip opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.gz opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.bz2 opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.xz | |
Merge branch '0.6.7-post-fixes' into vehicles
Diffstat (limited to 'OpenSim/Grid/UserServer/Main.cs')
| -rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 4 |
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() |