diff options
author | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
commit | 16b6738cdadc70966a93b6d025ae469738955dcb (patch) | |
tree | 7a3c0075e9ee5fd04d972bc52be38aec4d51f648 /OpenSim/Framework/Communications/LoginService.cs | |
parent | DNE code cleanups (diff) | |
download | opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.zip opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.gz opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.bz2 opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.xz |
* Patch from JHurliman
* Updates to libomv r2243,
* Remove lots of unnecessary typecasts
* Improves SendWindData()
Thanks jhurliman.
* Will update OpenSim-libs in 10 minutes..
Diffstat (limited to 'OpenSim/Framework/Communications/LoginService.cs')
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 8d27a23..7a39a97 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -165,7 +165,7 @@ namespace OpenSim.Framework.Communications | |||
165 | } | 165 | } |
166 | else if (requestData.Contains("web_login_key")) | 166 | else if (requestData.Contains("web_login_key")) |
167 | { | 167 | { |
168 | UUID webloginkey = null; | 168 | UUID webloginkey = UUID.Zero; |
169 | try | 169 | try |
170 | { | 170 | { |
171 | webloginkey = new UUID((string)requestData["web_login_key"]); | 171 | webloginkey = new UUID((string)requestData["web_login_key"]); |
@@ -268,9 +268,9 @@ namespace OpenSim.Framework.Communications | |||
268 | logResponse.CircuitCode = Util.RandomClass.Next(); | 268 | logResponse.CircuitCode = Util.RandomClass.Next(); |
269 | logResponse.Lastname = userProfile.SurName; | 269 | logResponse.Lastname = userProfile.SurName; |
270 | logResponse.Firstname = userProfile.FirstName; | 270 | logResponse.Firstname = userProfile.FirstName; |
271 | logResponse.AgentID = agentID.ToString(); | 271 | logResponse.AgentID = agentID; |
272 | logResponse.SessionID = userProfile.CurrentAgent.SessionID.ToString(); | 272 | logResponse.SessionID = userProfile.CurrentAgent.SessionID; |
273 | logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID.ToString(); | 273 | logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID; |
274 | logResponse.Message = GetMessage(); | 274 | logResponse.Message = GetMessage(); |
275 | logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID)); | 275 | logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID)); |
276 | logResponse.StartLocation = startLocationRequest; | 276 | logResponse.StartLocation = startLocationRequest; |
@@ -436,9 +436,9 @@ namespace OpenSim.Framework.Communications | |||
436 | logResponse.CircuitCode = (Int32)Util.RandomClass.Next(); | 436 | logResponse.CircuitCode = (Int32)Util.RandomClass.Next(); |
437 | logResponse.Lastname = userProfile.SurName; | 437 | logResponse.Lastname = userProfile.SurName; |
438 | logResponse.Firstname = userProfile.FirstName; | 438 | logResponse.Firstname = userProfile.FirstName; |
439 | logResponse.AgentID = agentID.ToString(); | 439 | logResponse.AgentID = agentID; |
440 | logResponse.SessionID = userProfile.CurrentAgent.SessionID.ToString(); | 440 | logResponse.SessionID = userProfile.CurrentAgent.SessionID; |
441 | logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID.ToString(); | 441 | logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID; |
442 | logResponse.Message = GetMessage(); | 442 | logResponse.Message = GetMessage(); |
443 | logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID)); | 443 | logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID)); |
444 | logResponse.StartLocation = startLocationRequest; | 444 | logResponse.StartLocation = startLocationRequest; |