aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-26 17:25:22 +0000
committerTeravus Ovares2008-09-26 17:25:22 +0000
commit16b6738cdadc70966a93b6d025ae469738955dcb (patch)
tree7a3c0075e9ee5fd04d972bc52be38aec4d51f648 /OpenSim/Framework/Communications
parentDNE code cleanups (diff)
downloadopensim-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 '')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs14
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 32a6c7d..1a442ea 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -523,7 +523,7 @@ namespace OpenSim.Framework.Communications.Cache
523 /// <param name="transferRequest"></param> 523 /// <param name="transferRequest"></param>
524 public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest) 524 public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest)
525 { 525 {
526 UUID requestID = null; 526 UUID requestID = UUID.Zero;
527 byte source = 2; 527 byte source = 2;
528 if (transferRequest.TransferInfo.SourceType == 2) 528 if (transferRequest.TransferInfo.SourceType == 2)
529 { 529 {
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;