Merge branch 'master' of ssh://MyConnection/var/git/opensim

2 files changed, 6 insertions, 5 deletions

diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 4a275c6..2f1fed4 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -213,15 +213,15 @@ namespace OpenSim.Services.HypergridService
         public bool VerifyClient(UUID sessionID, string token)
         {
             m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with token {1}", sessionID, token);
-            return true;
+            //return true;
 
             // Commenting this for now until I understand better what part of a sender's
             // info stays unchanged throughout a session
-            //
-            //if (m_TravelingAgents.ContainsKey(sessionID))
-            //    return m_TravelingAgents[sessionID].ClientToken == token;
 
-            //return false;
+            if (m_TravelingAgents.ContainsKey(sessionID))
+                return m_TravelingAgents[sessionID].ClientToken == token;
+
+            return false;
         }
 
         public bool VerifyAgent(UUID sessionID, string token)
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 7471c77..9d151df 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -746,6 +746,7 @@ namespace OpenSim.Services.LLLoginService
             m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName);
             if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason))
             {
+                //IPAddress addr = NetworkUtil.GetIPFor(clientIP.Address, gatekeeper.ExternalEndPoint.Address);
                 m_UserAgentService.SetClientToken(aCircuit.SessionID, clientIP.Address.ToString());
                 return true;
             }