diff options
| author | John Hurliman | 2010-03-05 17:05:15 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-03-05 17:05:15 -0800 |
| commit | 27b8d13057ff0a79d7162c8876d9796c6cf72111 (patch) | |
| tree | db21554a71f0c043041df01f4a4e0e03fd7c5668 /OpenSim/Region/ScriptEngine | |
| parent | * Cache packed throttle data to avoid repeated allocations in CheckForSignifi... (diff) | |
| parent | refactor: Move DetachSingleAttachmentToInv to region module (diff) | |
| download | opensim-SC_OLD-27b8d13057ff0a79d7162c8876d9796c6cf72111.zip opensim-SC_OLD-27b8d13057ff0a79d7162c8876d9796c6cf72111.tar.gz opensim-SC_OLD-27b8d13057ff0a79d7162c8876d9796c6cf72111.tar.bz2 opensim-SC_OLD-27b8d13057ff0a79d7162c8876d9796c6cf72111.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 0134b03..8217248 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -2896,9 +2896,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2896 | 2896 | ||
| 2897 | ScenePresence presence = World.GetScenePresence(m_host.OwnerID); | 2897 | ScenePresence presence = World.GetScenePresence(m_host.OwnerID); |
| 2898 | 2898 | ||
| 2899 | m_ScriptEngine.World.AttachObject(presence.ControllingClient, | 2899 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; |
| 2900 | grp.LocalId, (uint)attachment, Quaternion.Identity, | 2900 | if (attachmentsModule != null) |
| 2901 | Vector3.Zero, false); | 2901 | attachmentsModule.AttachObject( |
| 2902 | presence.ControllingClient, grp.LocalId, | ||
| 2903 | (uint)attachment, Quaternion.Identity, Vector3.Zero, false); | ||
| 2902 | } | 2904 | } |
| 2903 | } | 2905 | } |
| 2904 | 2906 | ||
| @@ -2929,8 +2931,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2929 | 2931 | ||
| 2930 | ScenePresence presence = World.GetScenePresence(m_host.OwnerID); | 2932 | ScenePresence presence = World.GetScenePresence(m_host.OwnerID); |
| 2931 | 2933 | ||
| 2932 | m_ScriptEngine.World.DetachSingleAttachmentToInv(itemID, | 2934 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; |
| 2933 | presence.ControllingClient); | 2935 | if (attachmentsModule != null) |
| 2936 | attachmentsModule.ShowDetachInUserInventory(itemID, presence.ControllingClient); | ||
| 2934 | } | 2937 | } |
| 2935 | } | 2938 | } |
| 2936 | 2939 | ||