diff options
Diffstat (limited to 'OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs | 9 |
1 files changed, 4 insertions, 5 deletions
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 | |||
104 | 104 | ||
105 | byte[] LoginAgent(Dictionary<string, object> request) | 105 | byte[] LoginAgent(Dictionary<string, object> request) |
106 | { | 106 | { |
107 | UUID principal = UUID.Zero; | 107 | string user = String.Empty; |
108 | UUID session = UUID.Zero; | 108 | UUID session = UUID.Zero; |
109 | UUID ssession = UUID.Zero; | 109 | UUID ssession = UUID.Zero; |
110 | 110 | ||
111 | if (!request.ContainsKey("PrincipalID") || !request.ContainsKey("SessionID")) | 111 | if (!request.ContainsKey("UserID") || !request.ContainsKey("SessionID")) |
112 | return FailureResult(); | 112 | return FailureResult(); |
113 | 113 | ||
114 | if (!UUID.TryParse(request["PrincipalID"].ToString(), out principal)) | 114 | user = request["UserID"].ToString(); |
115 | return FailureResult(); | ||
116 | 115 | ||
117 | if (!UUID.TryParse(request["SessionID"].ToString(), out session)) | 116 | if (!UUID.TryParse(request["SessionID"].ToString(), out session)) |
118 | return FailureResult(); | 117 | return FailureResult(); |
@@ -121,7 +120,7 @@ namespace OpenSim.Server.Handlers.Presence | |||
121 | // If it's malformed, we go on with a Zero on it | 120 | // If it's malformed, we go on with a Zero on it |
122 | UUID.TryParse(request["SecureSessionID"].ToString(), out ssession); | 121 | UUID.TryParse(request["SecureSessionID"].ToString(), out ssession); |
123 | 122 | ||
124 | if (m_PresenceService.LoginAgent(principal, session, ssession)) | 123 | if (m_PresenceService.LoginAgent(user, session, ssession)) |
125 | return SuccessResult(); | 124 | return SuccessResult(); |
126 | 125 | ||
127 | return FailureResult(); | 126 | return FailureResult(); |