aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
diff options
context:
space:
mode:
authorDiva Canto2010-01-17 20:10:42 -0800
committerDiva Canto2010-01-17 20:10:42 -0800
commitb5fcb5e872ec138ff7138906bffae193b6dae1a6 (patch)
treeedbf410ccc19cc118287513222e1e6d3a090b332 /OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
parentAgent gets there through the Gatekeeper, but still a few quirks to fix. (diff)
downloadopensim-SC_OLD-b5fcb5e872ec138ff7138906bffae193b6dae1a6.zip
opensim-SC_OLD-b5fcb5e872ec138ff7138906bffae193b6dae1a6.tar.gz
opensim-SC_OLD-b5fcb5e872ec138ff7138906bffae193b6dae1a6.tar.bz2
opensim-SC_OLD-b5fcb5e872ec138ff7138906bffae193b6dae1a6.tar.xz
HG teleports through gatekeeper are working.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs11
1 files changed, 0 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index e5a862d..6645293 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -148,17 +148,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
148 return m_aScene.SimulationService.CreateAgent(reg, agentCircuit, teleportFlags, out reason); 148 return m_aScene.SimulationService.CreateAgent(reg, agentCircuit, teleportFlags, out reason);
149 } 149 }
150 150
151 protected override bool UpdateAgent(GridRegion reg, GridRegion finalDestination, AgentData agent)
152 {
153 if (reg.RegionLocX != finalDestination.RegionLocX && reg.RegionLocY != finalDestination.RegionLocY)
154 {
155 // this user is going to another grid
156 return m_GatekeeperConnector.UpdateAgent(reg, agent);
157 }
158
159 return m_aScene.SimulationService.UpdateAgent(reg, agent);
160 }
161
162 #endregion 151 #endregion
163 } 152 }
164} 153}