OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

soprefactor
Teravus Ovares (Dan Olivares) 2010-05-16 01:48:28 -04:00
parent d4192dcb2e ff4f50396a
commit a974146921
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Services/HypergridService/UserAgentService.cs
View File

@ -213,15 +213,15 @@ namespace OpenSim.Services.HypergridService
public bool VerifyClient(UUID sessionID, string token) public bool VerifyClient(UUID sessionID, string token)
{ {
m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with token {1}", sessionID, 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 // Commenting this for now until I understand better what part of a sender's
// info stays unchanged throughout a session // 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) public bool VerifyAgent(UUID sessionID, string token)

1
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -746,6 +746,7 @@ namespace OpenSim.Services.LLLoginService
m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName);
if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason)) 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()); m_UserAgentService.SetClientToken(aCircuit.SessionID, clientIP.Address.ToString());
return true; return true;
} }