From 92a40129b5dfde0d8ef798941f5efb31ca3a73fd Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 28 Dec 2009 17:34:42 +0000 Subject: Database and presence changes. Untested --- OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs') diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs index b02c2ed..580cb15 100644 --- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs @@ -104,15 +104,14 @@ namespace OpenSim.Server.Handlers.Presence byte[] LoginAgent(Dictionary request) { - UUID principal = UUID.Zero; + string user = String.Empty; UUID session = UUID.Zero; UUID ssession = UUID.Zero; - if (!request.ContainsKey("PrincipalID") || !request.ContainsKey("SessionID")) + if (!request.ContainsKey("UserID") || !request.ContainsKey("SessionID")) return FailureResult(); - if (!UUID.TryParse(request["PrincipalID"].ToString(), out principal)) - return FailureResult(); + user = request["UserID"].ToString(); if (!UUID.TryParse(request["SessionID"].ToString(), out session)) return FailureResult(); @@ -121,7 +120,7 @@ namespace OpenSim.Server.Handlers.Presence // If it's malformed, we go on with a Zero on it UUID.TryParse(request["SecureSessionID"].ToString(), out ssession); - if (m_PresenceService.LoginAgent(principal, session, ssession)) + if (m_PresenceService.LoginAgent(user, session, ssession)) return SuccessResult(); return FailureResult(); -- cgit v1.1