diff options
| author | Melanie | 2012-06-29 22:24:53 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-29 22:24:53 +0100 |
| commit | 6137f37028a798f87af3f8afb71ec4856b2a5ad8 (patch) | |
| tree | 39289035f883415b5ccae36a9b2af1ad60c7acf6 /OpenSim/Region/ScriptEngine/Shared/Api | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Move update of the final optional ODE total frame stat inside the OdeLock rat... (diff) | |
| download | opensim-SC-6137f37028a798f87af3f8afb71ec4856b2a5ad8.zip opensim-SC-6137f37028a798f87af3f8afb71ec4856b2a5ad8.tar.gz opensim-SC-6137f37028a798f87af3f8afb71ec4856b2a5ad8.tar.bz2 opensim-SC-6137f37028a798f87af3f8afb71ec4856b2a5ad8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 389980e..04c4c00 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -3267,15 +3267,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3267 | 3267 | ||
| 3268 | private void DetachWrapper(object o) | 3268 | private void DetachWrapper(object o) |
| 3269 | { | 3269 | { |
| 3270 | SceneObjectPart host = (SceneObjectPart)o; | 3270 | if (World.AttachmentsModule != null) |
| 3271 | 3271 | { | |
| 3272 | SceneObjectGroup grp = host.ParentGroup; | 3272 | SceneObjectPart host = (SceneObjectPart)o; |
| 3273 | UUID itemID = grp.FromItemID; | 3273 | ScenePresence presence = World.GetScenePresence(host.OwnerID); |
| 3274 | ScenePresence presence = World.GetScenePresence(host.OwnerID); | 3274 | World.AttachmentsModule.DetachSingleAttachmentToInv(presence, host.ParentGroup); |
| 3275 | 3275 | } | |
| 3276 | IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; | ||
| 3277 | if (attachmentsModule != null) | ||
| 3278 | attachmentsModule.DetachSingleAttachmentToInv(presence, itemID); | ||
| 3279 | } | 3276 | } |
| 3280 | 3277 | ||
| 3281 | public void llAttachToAvatar(int attachmentPoint) | 3278 | public void llAttachToAvatar(int attachmentPoint) |