ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

TPs are root agents only

Browse Source
This commit is contained in:
UbitUmarov
2021-09-17 01:48:16 +01:00
parent 2d7437cd31
commit 1e85f54275
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -1028,7 +1028,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (UUID.TryParse(agent, out UUID agentId))
{
ScenePresence presence = World.GetScenePresence(agentId);
if (presence == null || presence.IsDeleted || presence.IsInTransit)
if (presence == null || presence.IsDeleted || presence.IsChildAgent || presence.IsInTransit)
return;
Vector3 pos = presence.AbsolutePosition;
@@ -1071,12 +1071,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
private void TeleportAgent(string agent, int regionGridX, int regionGridY,
LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
{
ulong regionHandle = Util.RegionGridLocToHandle((uint)regionGridX, (uint)regionGridY);
if (UUID.TryParse(agent, out UUID agentId))
{
ScenePresence presence = World.GetScenePresence(agentId);
if (presence == null || presence.IsDeleted || presence.IsInTransit)
if (presence == null || presence.IsDeleted || presence.IsChildAgent || presence.IsInTransit)
return;
Vector3 pos = presence.AbsolutePosition;
@@ -1086,6 +1084,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return;
}
ulong regionHandle = Util.RegionGridLocToHandle((uint)regionGridX, (uint)regionGridY);
Util.FireAndForget(
o => World.RequestTeleportLocation(
presence.ControllingClient, regionHandle,
@@ -1101,7 +1100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (UUID.TryParse(agent, out UUID agentId))
{
ScenePresence presence = World.GetScenePresence(agentId);
if (presence == null || presence.IsDeleted || presence.IsInTransit)
if (presence == null || presence.IsDeleted || presence.IsChildAgent || presence.IsInTransit)
return;
Vector3 pos = presence.AbsolutePosition;