diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 53be68f..d4b2f2d 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -112,6 +112,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
112 | private Stat m_interRegionTeleportFailures; | 112 | private Stat m_interRegionTeleportFailures; |
113 | 113 | ||
114 | protected string m_ThisHomeURI; | 114 | protected string m_ThisHomeURI; |
115 | protected string m_GatekeeperURI; | ||
115 | 116 | ||
116 | protected bool m_Enabled = false; | 117 | protected bool m_Enabled = false; |
117 | 118 | ||
@@ -215,6 +216,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
215 | m_ThisHomeURI = hypergridConfig.GetString("HomeURI", string.Empty); | 216 | m_ThisHomeURI = hypergridConfig.GetString("HomeURI", string.Empty); |
216 | if (m_ThisHomeURI != string.Empty && !m_ThisHomeURI.EndsWith("/")) | 217 | if (m_ThisHomeURI != string.Empty && !m_ThisHomeURI.EndsWith("/")) |
217 | m_ThisHomeURI += '/'; | 218 | m_ThisHomeURI += '/'; |
219 | |||
220 | m_GatekeeperURI = hypergridConfig.GetString("GatekeeperURI", string.Empty); | ||
221 | if (m_GatekeeperURI != string.Empty && !m_GatekeeperURI.EndsWith("/")) | ||
222 | m_GatekeeperURI += '/'; | ||
218 | } | 223 | } |
219 | 224 | ||
220 | IConfig transferConfig = source.Configs["EntityTransfer"]; | 225 | IConfig transferConfig = source.Configs["EntityTransfer"]; |
@@ -1307,7 +1312,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1307 | protected virtual bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout) | 1312 | protected virtual bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout) |
1308 | { | 1313 | { |
1309 | GridRegion source = new GridRegion(Scene.RegionInfo); | 1314 | GridRegion source = new GridRegion(Scene.RegionInfo); |
1310 | source.RawServerURI = m_ThisHomeURI; | 1315 | source.RawServerURI = m_GatekeeperURI; |
1311 | 1316 | ||
1312 | logout = false; | 1317 | logout = false; |
1313 | bool success = Scene.SimulationService.CreateAgent(source, finalDestination, agentCircuit, teleportFlags, out reason); | 1318 | bool success = Scene.SimulationService.CreateAgent(source, finalDestination, agentCircuit, teleportFlags, out reason); |
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index 79bff06..0becfb2 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
288 | connector = new UserAgentServiceConnector(userAgentDriver); | 288 | connector = new UserAgentServiceConnector(userAgentDriver); |
289 | 289 | ||
290 | GridRegion source = new GridRegion(Scene.RegionInfo); | 290 | GridRegion source = new GridRegion(Scene.RegionInfo); |
291 | source.RawServerURI = m_ThisHomeURI; | 291 | source.RawServerURI = m_GatekeeperURI; |
292 | 292 | ||
293 | bool success = connector.LoginAgentToGrid(source, agentCircuit, reg, finalDestination, false, out reason); | 293 | bool success = connector.LoginAgentToGrid(source, agentCircuit, reg, finalDestination, false, out reason); |
294 | logout = success; // flag for later logout from this grid; this is an HG TP | 294 | logout = success; // flag for later logout from this grid; this is an HG TP |