diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index aed2dc8..eb19fe2 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -134,12 +134,14 @@ namespace OpenSim.Services.HypergridService | |||
134 | public bool LoginAgentToGrid(AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, IPEndPoint clientIP, out string reason) | 134 | public bool LoginAgentToGrid(AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, IPEndPoint clientIP, out string reason) |
135 | { | 135 | { |
136 | m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", | 136 | m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", |
137 | agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()), | 137 | agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()), gatekeeper.ServerURI); |
138 | gatekeeper.ExternalHostName +":"+ gatekeeper.HttpPort); | ||
139 | m_log.Debug("gatekeeper serveruri -> " + gatekeeper.ServerURI ); | ||
140 | 138 | ||
139 | m_log.Debug("LATG final server uri -> " + finalDestination.ServerURI ); | ||
141 | // Take the IP address + port of the gatekeeper (reg) plus the info of finalDestination | 140 | // Take the IP address + port of the gatekeeper (reg) plus the info of finalDestination |
142 | GridRegion region = new GridRegion(gatekeeper); | 141 | GridRegion region = new GridRegion(gatekeeper); |
142 | region.ServerURI = gatekeeper.ServerURI; | ||
143 | region.ExternalHostName = finalDestination.ExternalHostName; | ||
144 | region.InternalEndPoint = finalDestination.InternalEndPoint; | ||
143 | region.RegionName = finalDestination.RegionName; | 145 | region.RegionName = finalDestination.RegionName; |
144 | region.RegionID = finalDestination.RegionID; | 146 | region.RegionID = finalDestination.RegionID; |
145 | region.RegionLocX = finalDestination.RegionLocX; | 147 | region.RegionLocX = finalDestination.RegionLocX; |
@@ -149,6 +151,8 @@ namespace OpenSim.Services.HypergridService | |||
149 | agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random(); | 151 | agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random(); |
150 | TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region); | 152 | TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region); |
151 | 153 | ||
154 | m_log.Debug("region ServerURI -> " + region.ServerURI); | ||
155 | |||
152 | bool success = false; | 156 | bool success = false; |
153 | string myExternalIP = string.Empty; | 157 | string myExternalIP = string.Empty; |
154 | string gridName = gatekeeper.ServerURI; | 158 | string gridName = gatekeeper.ServerURI; |