diff options
author | Melanie | 2013-06-23 01:59:57 +0100 |
---|---|---|
committer | Melanie | 2013-06-23 01:59:57 +0100 |
commit | f70357eaa355b8c152f3d793d0fceafa14df5fd4 (patch) | |
tree | ffda32c340bd7f6d69652e9d9a959c7396f42a2f /OpenSim/Services/HypergridService | |
parent | Merge branch 'avination-current' into careminster (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.zip opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.gz opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.bz2 opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Services/HypergridService')
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index ec76508..a6b5fc2 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -210,10 +210,10 @@ namespace OpenSim.Services.HypergridService | |||
210 | return home; | 210 | return home; |
211 | } | 211 | } |
212 | 212 | ||
213 | public bool LoginAgentToGrid(AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, IPEndPoint clientIP, out string reason) | 213 | public bool LoginAgentToGrid(AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason) |
214 | { | 214 | { |
215 | m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", | 215 | m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", |
216 | agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()), gatekeeper.ServerURI); | 216 | agentCircuit.firstname, agentCircuit.lastname, (fromLogin ? agentCircuit.IPAddress : "stored IP"), gatekeeper.ServerURI); |
217 | 217 | ||
218 | string gridName = gatekeeper.ServerURI; | 218 | string gridName = gatekeeper.ServerURI; |
219 | 219 | ||
@@ -265,7 +265,7 @@ namespace OpenSim.Services.HypergridService | |||
265 | bool success = false; | 265 | bool success = false; |
266 | string myExternalIP = string.Empty; | 266 | string myExternalIP = string.Empty; |
267 | 267 | ||
268 | m_log.DebugFormat("[USER AGENT SERVICE]: this grid: {0}, desired grid: {1}", m_GridName, gridName); | 268 | m_log.DebugFormat("[USER AGENT SERVICE]: this grid: {0}, desired grid: {1}, desired region: {2}", m_GridName, gridName, region.RegionID); |
269 | 269 | ||
270 | if (m_GridName == gridName) | 270 | if (m_GridName == gridName) |
271 | success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); | 271 | success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); |
@@ -296,8 +296,8 @@ namespace OpenSim.Services.HypergridService | |||
296 | 296 | ||
297 | m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP); | 297 | m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP); |
298 | // else set the IP addresses associated with this client | 298 | // else set the IP addresses associated with this client |
299 | if (clientIP != null) | 299 | if (fromLogin) |
300 | m_TravelingAgents[agentCircuit.SessionID].ClientIPAddress = clientIP.Address.ToString(); | 300 | m_TravelingAgents[agentCircuit.SessionID].ClientIPAddress = agentCircuit.IPAddress; |
301 | m_TravelingAgents[agentCircuit.SessionID].MyIpAddress = myExternalIP; | 301 | m_TravelingAgents[agentCircuit.SessionID].MyIpAddress = myExternalIP; |
302 | 302 | ||
303 | return true; | 303 | return true; |
@@ -306,7 +306,7 @@ namespace OpenSim.Services.HypergridService | |||
306 | public bool LoginAgentToGrid(AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, out string reason) | 306 | public bool LoginAgentToGrid(AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, out string reason) |
307 | { | 307 | { |
308 | reason = string.Empty; | 308 | reason = string.Empty; |
309 | return LoginAgentToGrid(agentCircuit, gatekeeper, finalDestination, null, out reason); | 309 | return LoginAgentToGrid(agentCircuit, gatekeeper, finalDestination, false, out reason); |
310 | } | 310 | } |
311 | 311 | ||
312 | private void SetClientIP(UUID sessionID, string ip) | 312 | private void SetClientIP(UUID sessionID, string ip) |