diff options
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 6 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 51 |
2 files changed, 28 insertions, 29 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index d18cf63..7c39e56 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -80,7 +80,13 @@ namespace OpenSim.Framework.UserManagement | |||
80 | 80 | ||
81 | userProfile = GetTheUser(firstname, lastname); | 81 | userProfile = GetTheUser(firstname, lastname); |
82 | if (userProfile == null) | 82 | if (userProfile == null) |
83 | { | ||
84 | MainLog.Instance.Verbose( | ||
85 | "LOGIN", | ||
86 | "Could not find a profile for " + firstname + " " + lastname); | ||
87 | |||
83 | return logResponse.CreateLoginFailedResponse(); | 88 | return logResponse.CreateLoginFailedResponse(); |
89 | } | ||
84 | 90 | ||
85 | GoodLogin = AuthenticateUser(userProfile, passwd); | 91 | GoodLogin = AuthenticateUser(userProfile, passwd); |
86 | } | 92 | } |
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index a82a58d..cc540e7 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -99,11 +99,7 @@ namespace OpenSim.Framework.UserManagement | |||
99 | profile.currentAgent = getUserAgent(profile.UUID); | 99 | profile.currentAgent = getUserAgent(profile.UUID); |
100 | return profile; | 100 | return profile; |
101 | } | 101 | } |
102 | } | 102 | } |
103 | |||
104 | MainLog.Instance.Notice( | ||
105 | "USERSTORAGE", | ||
106 | "Could not find user " + uuid.ToStringHyphenated() + " in persistent storage."); | ||
107 | 103 | ||
108 | return null; | 104 | return null; |
109 | } | 105 | } |
@@ -145,10 +141,7 @@ namespace OpenSim.Framework.UserManagement | |||
145 | return profile; | 141 | return profile; |
146 | } | 142 | } |
147 | } | 143 | } |
148 | 144 | ||
149 | MainLog.Instance.Notice( | ||
150 | "USERSTORAGE", "Could not find user " + fname + " " + lname + " in persistent storage."); | ||
151 | |||
152 | return null; | 145 | return null; |
153 | } | 146 | } |
154 | 147 | ||
@@ -292,26 +285,26 @@ namespace OpenSim.Framework.UserManagement | |||
292 | agent.currentPos = profile.homeLocation; | 285 | agent.currentPos = profile.homeLocation; |
293 | 286 | ||
294 | // If user specified additional start, use that | 287 | // If user specified additional start, use that |
295 | if (requestData.ContainsKey("start")) | 288 | // if (requestData.ContainsKey("start")) |
296 | { | 289 | // { |
297 | string startLoc = ((string) requestData["start"]).Trim(); | 290 | // string startLoc = ((string) requestData["start"]).Trim(); |
298 | if (!(startLoc == "last" || startLoc == "home")) | 291 | // if (!(startLoc == "last" || startLoc == "home")) |
299 | { | 292 | // { |
300 | // Format: uri:Ahern&162&213&34 | 293 | // // Format: uri:Ahern&162&213&34 |
301 | try | 294 | // try |
302 | { | 295 | // { |
303 | string[] parts = startLoc.Remove(0, 4).Split('&'); | 296 | // string[] parts = startLoc.Remove(0, 4).Split('&'); |
304 | //string region = parts[0]; | 297 | // //string region = parts[0]; |
305 | 298 | // | |
306 | //////////////////////////////////////////////////// | 299 | // //////////////////////////////////////////////////// |
307 | //SimProfile SimInfo = new SimProfile(); | 300 | // //SimProfile SimInfo = new SimProfile(); |
308 | //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey); | 301 | // //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey); |
309 | } | 302 | // } |
310 | catch (Exception) | 303 | // catch (Exception) |
311 | { | 304 | // { |
312 | } | 305 | // } |
313 | } | 306 | // } |
314 | } | 307 | // } |
315 | 308 | ||
316 | // What time did the user login? | 309 | // What time did the user login? |
317 | agent.loginTime = Util.UnixTimeSinceEpoch(); | 310 | agent.loginTime = Util.UnixTimeSinceEpoch(); |