* Patch from JHurliman

* Updates to libomv r2243, 
* Remove lots of unnecessary typecasts
* Improves SendWindData()
Thanks jhurliman. 
* Will update OpenSim-libs in 10 minutes..    

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
         /// <param name="transferRequest"></param>
         public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest)
         {
-            UUID requestID = null;
+            UUID requestID = UUID.Zero;
             byte source = 2;
             if (transferRequest.TransferInfo.SourceType == 2)
             {
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
                     }
                     else if (requestData.Contains("web_login_key"))
                     {
-                        UUID webloginkey = null;
+                        UUID webloginkey = UUID.Zero;
                         try
                         {
                             webloginkey = new UUID((string)requestData["web_login_key"]);
@@ -268,9 +268,9 @@ namespace OpenSim.Framework.Communications
                         logResponse.CircuitCode = Util.RandomClass.Next();
                         logResponse.Lastname = userProfile.SurName;
                         logResponse.Firstname = userProfile.FirstName;
-                        logResponse.AgentID = agentID.ToString();
-                        logResponse.SessionID = userProfile.CurrentAgent.SessionID.ToString();
-                        logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID.ToString();
+                        logResponse.AgentID = agentID;
+                        logResponse.SessionID = userProfile.CurrentAgent.SessionID;
+                        logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID;
                         logResponse.Message = GetMessage();
                         logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID));
                         logResponse.StartLocation = startLocationRequest;
@@ -436,9 +436,9 @@ namespace OpenSim.Framework.Communications
                         logResponse.CircuitCode = (Int32)Util.RandomClass.Next();
                         logResponse.Lastname = userProfile.SurName;
                         logResponse.Firstname = userProfile.FirstName;
-                        logResponse.AgentID = agentID.ToString();
-                        logResponse.SessionID = userProfile.CurrentAgent.SessionID.ToString();
-                        logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID.ToString();
+                        logResponse.AgentID = agentID;
+                        logResponse.SessionID = userProfile.CurrentAgent.SessionID;
+                        logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID;
                         logResponse.Message = GetMessage();
                         logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID));
                         logResponse.StartLocation = startLocationRequest;