diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 32e46ec..d38fe9f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3505,6 +3505,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3505 | { | 3505 | { |
3506 | m_host.AddScriptLPS(1); | 3506 | m_host.AddScriptLPS(1); |
3507 | UUID invItemID = InventorySelf(); | 3507 | UUID invItemID = InventorySelf(); |
3508 | UUID targetID; | ||
3509 | |||
3510 | if (!UUID.TryParse(target, out targetID)) | ||
3511 | return; | ||
3508 | 3512 | ||
3509 | TaskInventoryItem item; | 3513 | TaskInventoryItem item; |
3510 | lock (m_host.TaskInventory) | 3514 | lock (m_host.TaskInventory) |
@@ -3524,7 +3528,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3524 | if (sp != null) | 3528 | if (sp != null) |
3525 | client = sp.ControllingClient; | 3529 | client = sp.ControllingClient; |
3526 | 3530 | ||
3527 | SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)target); | 3531 | SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)targetID); |
3528 | 3532 | ||
3529 | if (targetPart.ParentGroup.RootPart.AttachmentPoint != 0) | 3533 | if (targetPart.ParentGroup.RootPart.AttachmentPoint != 0) |
3530 | return; // Fail silently if attached | 3534 | return; // Fail silently if attached |
@@ -4070,7 +4074,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4070 | if (m_host.OwnerID == World.LandChannel.GetLandObject( | 4074 | if (m_host.OwnerID == World.LandChannel.GetLandObject( |
4071 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) | 4075 | presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) |
4072 | { | 4076 | { |
4073 | presence.ControllingClient.SendTeleportLocationStart(); | ||
4074 | World.TeleportClientHome(agentId, presence.ControllingClient); | 4077 | World.TeleportClientHome(agentId, presence.ControllingClient); |
4075 | } | 4078 | } |
4076 | } | 4079 | } |