diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index 04a0db6..74b834a 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
@@ -313,6 +313,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
313 | return base.CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout); | 313 | return base.CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout); |
314 | } | 314 | } |
315 | 315 | ||
316 | public void TriggerTeleportHome(UUID id, IClientAPI client) | ||
317 | { | ||
318 | TeleportHome(id, client); | ||
319 | } | ||
320 | |||
316 | protected override bool ValidateGenericConditions(ScenePresence sp, GridRegion reg, GridRegion finalDestination, uint teleportFlags, out string reason) | 321 | protected override bool ValidateGenericConditions(ScenePresence sp, GridRegion reg, GridRegion finalDestination, uint teleportFlags, out string reason) |
317 | { | 322 | { |
318 | reason = "Please wear your grid's allowed appearance before teleporting to another grid"; | 323 | reason = "Please wear your grid's allowed appearance before teleporting to another grid"; |
@@ -431,11 +436,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
431 | // return base.UpdateAgent(reg, finalDestination, agentData, sp); | 436 | // return base.UpdateAgent(reg, finalDestination, agentData, sp); |
432 | //} | 437 | //} |
433 | 438 | ||
434 | public virtual void TriggerTeleportHome(UUID id, IClientAPI client) | ||
435 | { | ||
436 | TeleportHome(id, client); | ||
437 | } | ||
438 | |||
439 | public override bool TeleportHome(UUID id, IClientAPI client) | 439 | public override bool TeleportHome(UUID id, IClientAPI client) |
440 | { | 440 | { |
441 | m_log.DebugFormat( | 441 | m_log.DebugFormat( |
@@ -483,9 +483,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
483 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}", | 483 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}", |
484 | aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName); | 484 | aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName); |
485 | 485 | ||
486 | DoTeleport( | 486 | DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome)); |
487 | sp, homeGatekeeper, finalDestination, | ||
488 | position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome)); | ||
489 | return true; | 487 | return true; |
490 | } | 488 | } |
491 | 489 | ||