OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: remove double initialization of user appearance module in Grid.UserServer.Main

remotes/origin/0.6.7-post-fixes
Justin Clark-Casey (justincc) 2009-09-23 16:24:26 +01:00
parent 97c18caa76
commit 03438f7d44
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/Communications/Services/LoginService.cs
View File

@ -1221,11 +1221,13 @@ namespace OpenSim.Framework.Communications.Services
{ {
return Util.CreateUnknownUserErrorResponse(); return Util.CreateUnknownUserErrorResponse();
} }
UUID.TryParse((string)requestData["session_id"], out guess_sid); UUID.TryParse((string)requestData["session_id"], out guess_sid);
if (guess_sid == UUID.Zero) if (guess_sid == UUID.Zero)
{ {
return Util.CreateUnknownUserErrorResponse(); return Util.CreateUnknownUserErrorResponse();
} }
if (m_userManager.VerifySession(guess_aid, guess_sid)) if (m_userManager.VerifySession(guess_aid, guess_sid))
{ {
authed = "TRUE"; authed = "TRUE";
@ -1243,6 +1245,5 @@ namespace OpenSim.Framework.Communications.Services
response.Value = responseData; response.Value = responseData;
return response; return response;
} }
} }
} }

4
OpenSim/Grid/UserServer/Main.cs
View File

@ -260,8 +260,6 @@ namespace OpenSim.Grid.UserServer
m_userManager.PostInitialise(); m_userManager.PostInitialise();
m_avatarAppearanceModule.PostInitialise(); m_avatarAppearanceModule.PostInitialise();
m_friendsModule.PostInitialise(); m_friendsModule.PostInitialise();
m_avatarAppearanceModule.PostInitialise();
} }
protected virtual void RegisterHttpHandlers() protected virtual void RegisterHttpHandlers()
@ -276,8 +274,6 @@ namespace OpenSim.Grid.UserServer
m_avatarAppearanceModule.RegisterHandlers(m_httpServer); m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
m_messagesService.RegisterHandlers(m_httpServer); m_messagesService.RegisterHandlers(m_httpServer);
m_gridInfoService.RegisterHandlers(m_httpServer); m_gridInfoService.RegisterHandlers(m_httpServer);
m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
} }
public override void ShutdownSpecific() public override void ShutdownSpecific()