diff options
Diffstat (limited to '')
3 files changed, 20 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 326ef28..666f353 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -222,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
222 | /// <param name="folderID"></param> | 222 | /// <param name="folderID"></param> |
223 | /// <param name="objectGroup"></param> | 223 | /// <param name="objectGroup"></param> |
224 | /// <param name="remoteClient"> </param> | 224 | /// <param name="remoteClient"> </param> |
225 | public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID, | 225 | public virtual UUID CopyToInventory(DeRezAction action, UUID folderID, |
226 | List<SceneObjectGroup> objectGroups, IClientAPI remoteClient) | 226 | List<SceneObjectGroup> objectGroups, IClientAPI remoteClient) |
227 | { | 227 | { |
228 | Dictionary<UUID, List<SceneObjectGroup>> deletes = new Dictionary<UUID, List<SceneObjectGroup>>(); | 228 | Dictionary<UUID, List<SceneObjectGroup>> deletes = new Dictionary<UUID, List<SceneObjectGroup>>(); |
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs index 05fc2ad..305975e 100644 --- a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs | |||
@@ -38,7 +38,23 @@ namespace OpenSim.Region.Framework.Interfaces | |||
38 | public interface IInventoryAccessModule | 38 | public interface IInventoryAccessModule |
39 | { | 39 | { |
40 | UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data); | 40 | UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data); |
41 | UUID DeleteToInventory(DeRezAction action, UUID folderID, List<SceneObjectGroup> objectGroups, IClientAPI remoteClient); | 41 | |
42 | /// <summary> | ||
43 | /// Copy objects to a user's inventory. | ||
44 | /// </summary> | ||
45 | /// <remarks> | ||
46 | /// Is it left to the caller to delete them from the scene if required. | ||
47 | /// </remarks> | ||
48 | /// <param name="action"></param> | ||
49 | /// <param name="folderID"></param> | ||
50 | /// <param name="objectGroups"></param> | ||
51 | /// <param name="remoteClient"></param> | ||
52 | /// <returns> | ||
53 | /// Returns the UUID of the newly created item asset (not the item itself). | ||
54 | /// FIXME: This is not very useful. It would be far more useful to return a list of items instead. | ||
55 | /// </returns> | ||
56 | UUID CopyToInventory(DeRezAction action, UUID folderID, List<SceneObjectGroup> objectGroups, IClientAPI remoteClient); | ||
57 | |||
42 | SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, | 58 | SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, |
43 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | 59 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, |
44 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); | 60 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); |
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs index 8feb022..3423542 100644 --- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | |||
@@ -143,7 +143,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
143 | { | 143 | { |
144 | IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>(); | 144 | IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>(); |
145 | if (invAccess != null) | 145 | if (invAccess != null) |
146 | invAccess.DeleteToInventory(x.action, x.folderID, x.objectGroups, x.remoteClient); | 146 | invAccess.CopyToInventory(x.action, x.folderID, x.objectGroups, x.remoteClient); |
147 | |||
147 | if (x.permissionToDelete) | 148 | if (x.permissionToDelete) |
148 | { | 149 | { |
149 | foreach (SceneObjectGroup g in x.objectGroups) | 150 | foreach (SceneObjectGroup g in x.objectGroups) |