diff options
| author | AliciaRaven | 2014-09-29 11:24:51 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-10-08 23:04:19 +0100 |
| commit | 8d4c1945c2902f1b91a7f9764189d32c6ba62b3b (patch) | |
| tree | 52cb705a846a74f6d49c021d3b1e4724101839ee /OpenSim | |
| parent | Add LSL transaction_result event. (diff) | |
| download | opensim-SC-8d4c1945c2902f1b91a7f9764189d32c6ba62b3b.zip opensim-SC-8d4c1945c2902f1b91a7f9764189d32c6ba62b3b.tar.gz opensim-SC-8d4c1945c2902f1b91a7f9764189d32c6ba62b3b.tar.bz2 opensim-SC-8d4c1945c2902f1b91a7f9764189d32c6ba62b3b.tar.xz | |
HG Restricted appearance checking code is only called when HG teleporting via the map but bypassed completely when teleporting via landmarks. This fixes this by including a call when acting on landmarks. Does not affect local grid teleports as flags are checked.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index a3cebe9..a0bb146 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
| @@ -541,6 +541,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 541 | if (message != null) | 541 | if (message != null) |
| 542 | sp.ControllingClient.SendAgentAlertMessage(message, true); | 542 | sp.ControllingClient.SendAgentAlertMessage(message, true); |
| 543 | 543 | ||
| 544 | // Validate assorted conditions | ||
| 545 | string reason = string.Empty; | ||
| 546 | if (!ValidateGenericConditions(sp, gatekeeper, finalDestination, 0, out reason)) | ||
| 547 | { | ||
| 548 | sp.ControllingClient.SendTeleportFailed(reason); | ||
| 549 | return; | ||
| 550 | } | ||
| 551 | |||
| 544 | transferMod.DoTeleport( | 552 | transferMod.DoTeleport( |
| 545 | sp, gatekeeper, finalDestination, lm.Position, Vector3.UnitX, | 553 | sp, gatekeeper, finalDestination, lm.Position, Vector3.UnitX, |
| 546 | (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark)); | 554 | (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark)); |