diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index fa23590..233b251 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
@@ -238,19 +238,19 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
238 | 238 | ||
239 | return region; | 239 | return region; |
240 | } | 240 | } |
241 | 241 | /* NEEDFIX | |
242 | protected override bool NeedsClosing(float drawdist, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY, GridRegion reg) | 242 | protected override bool NeedsClosing(float drawdist, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY, GridRegion reg) |
243 | { | 243 | { |
244 | if (base.NeedsClosing(drawdist, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) | 244 | if (base.NeedsClosing(drawdist, oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) |
245 | return true; | 245 | return true; |
246 | 246 | ||
247 | int flags = Scene.GridService.GetRegionFlags(Scene.RegionInfo.ScopeID, reg.RegionID); | 247 | int flags = Scene.GridService.GetRegionFlags(Scene.RegionInfo.ScopeID, reg.RegionID); |
248 | if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Framework.RegionFlags.Hyperlink) != 0) | 248 | if (flags == -1 || (flags & (int)OpenSim.Framework.RegionFlags.Hyperlink) != 0) |
249 | return true; | 249 | return true; |
250 | 250 | ||
251 | return false; | 251 | return false; |
252 | } | 252 | } |
253 | 253 | */ | |
254 | protected override void AgentHasMovedAway(ScenePresence sp, bool logout) | 254 | protected override void AgentHasMovedAway(ScenePresence sp, bool logout) |
255 | { | 255 | { |
256 | base.AgentHasMovedAway(sp, logout); | 256 | base.AgentHasMovedAway(sp, logout); |
@@ -311,6 +311,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
311 | return base.CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout); | 311 | return base.CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout); |
312 | } | 312 | } |
313 | 313 | ||
314 | public void TriggerTeleportHome(UUID id, IClientAPI client) | ||
315 | { | ||
316 | TeleportHome(id, client); | ||
317 | } | ||
318 | |||
314 | protected override bool ValidateGenericConditions(ScenePresence sp, GridRegion reg, GridRegion finalDestination, uint teleportFlags, out string reason) | 319 | protected override bool ValidateGenericConditions(ScenePresence sp, GridRegion reg, GridRegion finalDestination, uint teleportFlags, out string reason) |
315 | { | 320 | { |
316 | reason = "Please wear your grid's allowed appearance before teleporting to another grid"; | 321 | reason = "Please wear your grid's allowed appearance before teleporting to another grid"; |
@@ -429,11 +434,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
429 | // return base.UpdateAgent(reg, finalDestination, agentData, sp); | 434 | // return base.UpdateAgent(reg, finalDestination, agentData, sp); |
430 | //} | 435 | //} |
431 | 436 | ||
437 | <<<<<<< HEAD | ||
432 | public override void TriggerTeleportHome(UUID id, IClientAPI client) | 438 | public override void TriggerTeleportHome(UUID id, IClientAPI client) |
433 | { | 439 | { |
434 | TeleportHome(id, client); | 440 | TeleportHome(id, client); |
435 | } | 441 | } |
436 | 442 | ||
443 | ======= | ||
444 | >>>>>>> avn/ubitvar | ||
437 | public override bool TeleportHome(UUID id, IClientAPI client) | 445 | public override bool TeleportHome(UUID id, IClientAPI client) |
438 | { | 446 | { |
439 | m_log.DebugFormat( | 447 | m_log.DebugFormat( |
@@ -491,9 +499,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
491 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}", | 499 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}", |
492 | aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName); | 500 | aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName); |
493 | 501 | ||
494 | DoTeleport( | 502 | DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome)); |
495 | sp, homeGatekeeper, finalDestination, | ||
496 | position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome)); | ||
497 | return true; | 503 | return true; |
498 | } | 504 | } |
499 | 505 | ||
@@ -760,4 +766,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
760 | return region; | 766 | return region; |
761 | } | 767 | } |
762 | } | 768 | } |
763 | } \ No newline at end of file | 769 | } |