ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2017-08-24 02:18:40 +01:00
parent b1fdb02be1 05b8ead8b2
commit a1aa2f1add
5 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1620,7 +1620,7 @@ namespace OpenSim.Region.Framework.Scenes
public void TeleportWithMomentum(Vector3 pos, Vector3? v)
{
if(!CheckLocalTPLandingPoint(ref pos))
return;
return;
if (ParentID != (uint)0)
StandUp();
@@ -1642,6 +1642,20 @@ namespace OpenSim.Region.Framework.Scenes
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)
{
if(!CheckLocalTPLandingPoint(ref newpos))