diff options
author | Justin Clark-Casey (justincc) | 2009-09-23 16:24:26 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-23 16:24:26 +0100 |
commit | 03438f7d449a09e28dcb1543b2075d70b2573ffc (patch) | |
tree | e1fc9611688e0b24802efc52ee82b119f6d42867 /OpenSim | |
parent | Thank you, Intari, for a patch that implements the missing pieces of (diff) | |
download | opensim-SC_OLD-03438f7d449a09e28dcb1543b2075d70b2573ffc.zip opensim-SC_OLD-03438f7d449a09e28dcb1543b2075d70b2573ffc.tar.gz opensim-SC_OLD-03438f7d449a09e28dcb1543b2075d70b2573ffc.tar.bz2 opensim-SC_OLD-03438f7d449a09e28dcb1543b2075d70b2573ffc.tar.xz |
minor: remove double initialization of user appearance module in Grid.UserServer.Main
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Communications/Services/LoginService.cs | 5 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs index bf59f8e..a6cd918 100644 --- a/OpenSim/Framework/Communications/Services/LoginService.cs +++ b/OpenSim/Framework/Communications/Services/LoginService.cs | |||
@@ -1221,11 +1221,13 @@ namespace OpenSim.Framework.Communications.Services | |||
1221 | { | 1221 | { |
1222 | return Util.CreateUnknownUserErrorResponse(); | 1222 | return Util.CreateUnknownUserErrorResponse(); |
1223 | } | 1223 | } |
1224 | |||
1224 | UUID.TryParse((string)requestData["session_id"], out guess_sid); | 1225 | UUID.TryParse((string)requestData["session_id"], out guess_sid); |
1225 | if (guess_sid == UUID.Zero) | 1226 | if (guess_sid == UUID.Zero) |
1226 | { | 1227 | { |
1227 | return Util.CreateUnknownUserErrorResponse(); | 1228 | return Util.CreateUnknownUserErrorResponse(); |
1228 | } | 1229 | } |
1230 | |||
1229 | if (m_userManager.VerifySession(guess_aid, guess_sid)) | 1231 | if (m_userManager.VerifySession(guess_aid, guess_sid)) |
1230 | { | 1232 | { |
1231 | authed = "TRUE"; | 1233 | authed = "TRUE"; |
@@ -1243,6 +1245,5 @@ namespace OpenSim.Framework.Communications.Services | |||
1243 | response.Value = responseData; | 1245 | response.Value = responseData; |
1244 | return response; | 1246 | return response; |
1245 | } | 1247 | } |
1246 | |||
1247 | } | 1248 | } |
1248 | } | 1249 | } \ No newline at end of file |
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() |