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

* a bit of additional debugging:

viewer-2-initial-appearance
Jonathan Freedman 2010-10-23 00:18:19 -04:00
parent 38e76d71ac
commit 5ddb8b535e
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,8 +135,6 @@ namespace OpenSim.Services.HypergridService
{ {
m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}",
agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()), gatekeeper.ServerURI); agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()), gatekeeper.ServerURI);
m_log.Debug("LATG final server uri -> " + finalDestination.ServerURI );
// Take the IP address + port of the gatekeeper (reg) plus the info of finalDestination // Take the IP address + port of the gatekeeper (reg) plus the info of finalDestination
GridRegion region = new GridRegion(gatekeeper); GridRegion region = new GridRegion(gatekeeper);
region.ServerURI = gatekeeper.ServerURI; region.ServerURI = gatekeeper.ServerURI;
@ -150,12 +148,13 @@ namespace OpenSim.Services.HypergridService
// Generate a new service session // Generate a new service session
agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random(); agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random();
TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region); TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region);
m_log.Debug("region ServerURI -> " + region.ServerURI);
bool success = false; bool success = false;
string myExternalIP = string.Empty; string myExternalIP = string.Empty;
string gridName = gatekeeper.ServerURI; string gridName = gatekeeper.ServerURI;
m_log.Debug("m_grid - " + m_GridName + ", gn - " + gridName);
if (m_GridName == gridName) if (m_GridName == gridName)
success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason);
else else

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

@ -566,6 +566,7 @@ namespace OpenSim.Services.LLLoginService
private GridRegion FindForeignRegion(string domainName, uint port, string regionName, out GridRegion gatekeeper) private GridRegion FindForeignRegion(string domainName, uint port, string regionName, out GridRegion gatekeeper)
{ {
m_log.Debug("attempting to findforeignregion " + domainName + ":" + port.ToString() + ":" + regionName);
gatekeeper = new GridRegion(); gatekeeper = new GridRegion();
gatekeeper.ExternalHostName = domainName; gatekeeper.ExternalHostName = domainName;
gatekeeper.HttpPort = port; gatekeeper.HttpPort = port;
@ -631,11 +632,9 @@ namespace OpenSim.Services.LLLoginService
gatekeeper = new GridRegion(destination); gatekeeper = new GridRegion(destination);
gatekeeper.ExternalHostName = hostName; gatekeeper.ExternalHostName = hostName;
gatekeeper.HttpPort = (uint)port; gatekeeper.HttpPort = (uint)port;
gatekeeper.ServerURI = m_GatekeeperURL;
}
else // login to foreign grid
{
} }
m_log.Debug("no gatekeeper detected..... using " + m_GatekeeperURL);
} }
bool success = false; bool success = false;