diff options
author | Melanie Thielker | 2010-08-18 20:17:20 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-08-18 20:17:20 +0200 |
commit | fb2deb0d452c67c9c0b30c32223ef91b844e5e68 (patch) | |
tree | 9fd92defae38e3eaf9768e1b6530f7bd088ad8d6 /OpenSim | |
parent | Fix a typecasting issue in llList2Float. This addresses mantis #262 (diff) | |
download | opensim-SC-fb2deb0d452c67c9c0b30c32223ef91b844e5e68.zip opensim-SC-fb2deb0d452c67c9c0b30c32223ef91b844e5e68.tar.gz opensim-SC-fb2deb0d452c67c9c0b30c32223ef91b844e5e68.tar.bz2 opensim-SC-fb2deb0d452c67c9c0b30c32223ef91b844e5e68.tar.xz |
Prevent a bad cast in llCreateLink().
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 76ade1f..97dd2e1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3780,6 +3780,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3780 | { | 3780 | { |
3781 | m_host.AddScriptLPS(1); | 3781 | m_host.AddScriptLPS(1); |
3782 | UUID invItemID = InventorySelf(); | 3782 | UUID invItemID = InventorySelf(); |
3783 | UUID targetID; | ||
3784 | |||
3785 | if (!UUID.TryParse(target, out targetID)) | ||
3786 | return; | ||
3783 | 3787 | ||
3784 | TaskInventoryItem item; | 3788 | TaskInventoryItem item; |
3785 | m_host.TaskInventory.LockItemsForRead(true); | 3789 | m_host.TaskInventory.LockItemsForRead(true); |
@@ -3798,7 +3802,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3798 | if (sp != null) | 3802 | if (sp != null) |
3799 | client = sp.ControllingClient; | 3803 | client = sp.ControllingClient; |
3800 | 3804 | ||
3801 | SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)target); | 3805 | SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)targetID); |
3802 | 3806 | ||
3803 | if (targetPart.ParentGroup.RootPart.AttachmentPoint != 0) | 3807 | if (targetPart.ParentGroup.RootPart.AttachmentPoint != 0) |
3804 | return; // Fail silently if attached | 3808 | return; // Fail silently if attached |