diff options
author | Tom Grimshaw | 2010-06-16 09:20:20 -0700 |
---|---|---|
committer | Tom Grimshaw | 2010-06-16 09:20:20 -0700 |
commit | b9c40320f108a84d7841cdc9e98009cf650f930e (patch) | |
tree | 70f4521cced9f0d1623d1e89a7ffb6b22cb19adb /OpenSim/Region/ScriptEngine/Shared/Api | |
parent | Allow llMapDestination to be used in any event if the host is an attachment. ... (diff) | |
download | opensim-SC_OLD-b9c40320f108a84d7841cdc9e98009cf650f930e.zip opensim-SC_OLD-b9c40320f108a84d7841cdc9e98009cf650f930e.tar.gz opensim-SC_OLD-b9c40320f108a84d7841cdc9e98009cf650f930e.tar.bz2 opensim-SC_OLD-b9c40320f108a84d7841cdc9e98009cf650f930e.tar.xz |
Fix llAttachToAvatar. This addresses mantis 128 .
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index c332fd8..877c3cb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3065,9 +3065,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3065 | { | 3065 | { |
3066 | m_host.AddScriptLPS(1); | 3066 | m_host.AddScriptLPS(1); |
3067 | 3067 | ||
3068 | if (m_host.ParentGroup.RootPart.AttachmentPoint == 0) | ||
3069 | return; | ||
3070 | |||
3071 | TaskInventoryItem item; | 3068 | TaskInventoryItem item; |
3072 | 3069 | ||
3073 | m_host.TaskInventory.LockItemsForRead(true); | 3070 | m_host.TaskInventory.LockItemsForRead(true); |
@@ -3093,11 +3090,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3093 | 3090 | ||
3094 | ScenePresence presence = World.GetScenePresence(m_host.OwnerID); | 3091 | ScenePresence presence = World.GetScenePresence(m_host.OwnerID); |
3095 | 3092 | ||
3093 | /* | ||
3096 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; | 3094 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; |
3097 | if (attachmentsModule != null) | 3095 | if (attachmentsModule != null) |
3096 | { | ||
3098 | attachmentsModule.AttachObject( | 3097 | attachmentsModule.AttachObject( |
3099 | presence.ControllingClient, grp.LocalId, | 3098 | presence.ControllingClient, grp.LocalId, |
3100 | (uint)attachment, Quaternion.Identity, Vector3.Zero, false); | 3099 | (uint)attachment, Quaternion.Identity, Vector3.Zero, false); |
3100 | } | ||
3101 | */ | ||
3102 | grp.AttachToAgent(m_host.OwnerID, (uint)attachment, Vector3.Zero, false); | ||
3101 | } | 3103 | } |
3102 | } | 3104 | } |
3103 | 3105 | ||