OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

script invocations cannot have void return type

connector_plugin
SignpostMarv 2012-09-17 13:02:56 +01:00 committed by Melanie
parent 380962d359
commit 5e626ce55d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
View File

@ -130,37 +130,37 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
SendConsoleOutput(agentID, String.Format("auto_grant_attach_perms set to {0}", val)); SendConsoleOutput(agentID, String.Format("auto_grant_attach_perms set to {0}", val));
} }
private void llAttachToAvatarTemp(UUID host, UUID script, int attachmentPoint) private int llAttachToAvatarTemp(UUID host, UUID script, int attachmentPoint)
{ {
SceneObjectPart hostPart = m_scene.GetSceneObjectPart(host); SceneObjectPart hostPart = m_scene.GetSceneObjectPart(host);
if (hostPart == null) if (hostPart == null)
return; return 0;
if (hostPart.ParentGroup.IsAttachment) if (hostPart.ParentGroup.IsAttachment)
return; return 0;
IAttachmentsModule attachmentsModule = m_scene.RequestModuleInterface<IAttachmentsModule>(); IAttachmentsModule attachmentsModule = m_scene.RequestModuleInterface<IAttachmentsModule>();
if (attachmentsModule == null) if (attachmentsModule == null)
return; return 0;
TaskInventoryItem item = hostPart.Inventory.GetInventoryItem(script); TaskInventoryItem item = hostPart.Inventory.GetInventoryItem(script);
if (item == null) if (item == null)
return; return 0;
if ((item.PermsMask & 32) == 0) // PERMISSION_ATTACH if ((item.PermsMask & 32) == 0) // PERMISSION_ATTACH
return; return 0;
ScenePresence target; ScenePresence target;
if (!m_scene.TryGetScenePresence(item.PermsGranter, out target)) if (!m_scene.TryGetScenePresence(item.PermsGranter, out target))
return; return 0;
if (target.UUID != hostPart.ParentGroup.OwnerID) if (target.UUID != hostPart.ParentGroup.OwnerID)
{ {
uint effectivePerms = hostPart.ParentGroup.GetEffectivePermissions(); uint effectivePerms = hostPart.ParentGroup.GetEffectivePermissions();
if ((effectivePerms & (uint)PermissionMask.Transfer) == 0) if ((effectivePerms & (uint)PermissionMask.Transfer) == 0)
return; return 0;
hostPart.ParentGroup.SetOwnerId(target.UUID); hostPart.ParentGroup.SetOwnerId(target.UUID);
hostPart.ParentGroup.SetRootPartOwner(hostPart.ParentGroup.RootPart, target.UUID, target.ControllingClient.ActiveGroupId); hostPart.ParentGroup.SetRootPartOwner(hostPart.ParentGroup.RootPart, target.UUID, target.ControllingClient.ActiveGroupId);
@ -183,7 +183,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
hostPart.ParentGroup.RootPart.ScheduleFullUpdate(); hostPart.ParentGroup.RootPart.ScheduleFullUpdate();
} }
attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true); return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true) ? 1 : 0;
} }
} }
} }