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

frozen avatars should not do local teleports. Possible none should not be allowed, but that may be abusive

BulletSim2017
UbitUmarov 2017-08-24 02:11:40 +01:00
parent c5802c9460
commit 05b8ead8b2
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -371,7 +371,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
teleportFlags |= (uint)TeleportFlags.Godlike; teleportFlags |= (uint)TeleportFlags.Godlike;
} }
if (!sp.Scene.Permissions.CanTeleport(sp.UUID)) else if (!sp.Scene.Permissions.CanTeleport(sp.UUID))
return; return;
string destinationRegionName = "(not found)"; string destinationRegionName = "(not found)";
@ -391,17 +391,27 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
try try
{ {
// Reset animations; the viewer does that in teleports.
sp.Animator.ResetAnimations();
if (regionHandle == sp.Scene.RegionInfo.RegionHandle) if (regionHandle == sp.Scene.RegionInfo.RegionHandle)
{ {
if(!sp.AllowMovement)
{
sp.ControllingClient.SendTeleportFailed("You are frozen");
m_entityTransferStateMachine.ResetFromTransit(sp.UUID);
return;
}
// Reset animations; the viewer does that in teleports.
sp.Animator.ResetAnimations();
destinationRegionName = sp.Scene.RegionInfo.RegionName; destinationRegionName = sp.Scene.RegionInfo.RegionName;
TeleportAgentWithinRegion(sp, position, lookAt, teleportFlags); TeleportAgentWithinRegion(sp, position, lookAt, teleportFlags);
} }
else // Another region possibly in another simulator else // Another region possibly in another simulator
{ {
// Reset animations; the viewer does that in teleports.
sp.Animator.ResetAnimations();
GridRegion finalDestination = null; GridRegion finalDestination = null;
try try
{ {