diff options
author | Melanie Thielker | 2008-08-19 22:01:59 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-08-19 22:01:59 +0000 |
commit | b28bac016aea38e69afa33ce4deee0ed53e7ce60 (patch) | |
tree | 9551a58c4e06905da3fc06f3ac6711dda6ff4095 /OpenSim/Region | |
parent | Mantis #2001 (diff) | |
download | opensim-SC-b28bac016aea38e69afa33ce4deee0ed53e7ce60.zip opensim-SC-b28bac016aea38e69afa33ce4deee0ed53e7ce60.tar.gz opensim-SC-b28bac016aea38e69afa33ce4deee0ed53e7ce60.tar.bz2 opensim-SC-b28bac016aea38e69afa33ce4deee0ed53e7ce60.tar.xz |
Fixes the previous commit of llMakeLink for Shared/
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 2 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 3d68121..b90ab79 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2769,7 +2769,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2769 | { | 2769 | { |
2770 | m_host.AddScriptLPS(1); | 2770 | m_host.AddScriptLPS(1); |
2771 | LLUUID invItemID = InventorySelf(); | 2771 | LLUUID invItemID = InventorySelf(); |
2772 | if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_CHANGE_LINKS) == 0) { | 2772 | if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0) { |
2773 | ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); | 2773 | ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); |
2774 | return; | 2774 | return; |
2775 | } | 2775 | } |
@@ -2778,7 +2778,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2778 | SceneObjectGroup parentPrim = null, childPrim = null; | 2778 | SceneObjectGroup parentPrim = null, childPrim = null; |
2779 | if (targetPart != null) | 2779 | if (targetPart != null) |
2780 | { | 2780 | { |
2781 | if (parent == BuiltIn_Commands_BaseClass.TRUE) { | 2781 | if (parent != 0) { |
2782 | parentPrim = m_host.ParentGroup; | 2782 | parentPrim = m_host.ParentGroup; |
2783 | childPrim = targetPart.ParentGroup; | 2783 | childPrim = targetPart.ParentGroup; |
2784 | } | 2784 | } |