OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

mb-throttle-test
AliciaRaven 2014-09-29 11:24:51 +01:00 committed by Justin Clark-Casey (justincc)
parent cbd428cff3
commit 8d4c1945c2
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
View File

@ -541,6 +541,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if (message != null) if (message != null)
sp.ControllingClient.SendAgentAlertMessage(message, true); sp.ControllingClient.SendAgentAlertMessage(message, true);
// Validate assorted conditions
string reason = string.Empty;
if (!ValidateGenericConditions(sp, gatekeeper, finalDestination, 0, out reason))
{
sp.ControllingClient.SendTeleportFailed(reason);
return;
}
transferMod.DoTeleport( transferMod.DoTeleport(
sp, gatekeeper, finalDestination, lm.Position, Vector3.UnitX, sp, gatekeeper, finalDestination, lm.Position, Vector3.UnitX,
(uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark)); (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaLandmark));