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

add missing file. Also in last commit comment the flag was relative to (un)freeze no t(un)eject

BulletSim2017
UbitUmarov 2017-08-24 01:38:04 +01:00
parent 74524cb3be
commit 1a7c8893ee
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1619,8 +1619,8 @@ namespace OpenSim.Region.Framework.Scenes
public void TeleportWithMomentum(Vector3 pos, Vector3? v) public void TeleportWithMomentum(Vector3 pos, Vector3? v)
{ {
if(!CheckLocalTPLandingPoint(ref pos)) if(!CheckLocalTPLandingPoint(ref pos))
return; return;
if (ParentID != (uint)0) if (ParentID != (uint)0)
StandUp(); StandUp();
@ -1642,6 +1642,20 @@ namespace OpenSim.Region.Framework.Scenes
SendTerseUpdateToAllClients(); SendTerseUpdateToAllClients();
} }
public void TeleportOnEject(Vector3 pos)
{
if (ParentID != (uint)0)
StandUp();
bool isFlying = Flying;
RemoveFromPhysicalScene();
AbsolutePosition = pos;
AddToPhysicalScene(isFlying);
SendTerseUpdateToAllClients();
}
public void avnLocalTeleport(Vector3 newpos, Vector3? newvel, bool rotateToVelXY) public void avnLocalTeleport(Vector3 newpos, Vector3? newvel, bool rotateToVelXY)
{ {
if(!CheckLocalTPLandingPoint(ref newpos)) if(!CheckLocalTPLandingPoint(ref newpos))