diff options
author | Melanie Thielker | 2010-06-01 02:27:30 +0200 |
---|---|---|
committer | Melanie | 2010-06-01 02:10:22 +0100 |
commit | f29cb57bf183c0530ead35890163f39903c8f410 (patch) | |
tree | 303f04127a4051be5d27c2007edc359e1e306478 /OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |
parent | Add a method to get the bounding box and root prim offsets within it for (diff) | |
download | opensim-SC_OLD-f29cb57bf183c0530ead35890163f39903c8f410.zip opensim-SC_OLD-f29cb57bf183c0530ead35890163f39903c8f410.tar.gz opensim-SC_OLD-f29cb57bf183c0530ead35890163f39903c8f410.tar.bz2 opensim-SC_OLD-f29cb57bf183c0530ead35890163f39903c8f410.tar.xz |
Continuing refactor. Refactor DeRezObject to deal with multiple objects
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 93aeb94..2ab46aa 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -119,9 +119,22 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
119 | /// | 119 | /// |
120 | /// DeleteToInventory | 120 | /// DeleteToInventory |
121 | /// | 121 | /// |
122 | public override UUID DeleteToInventory(DeRezAction action, UUID folderID, SceneObjectGroup objectGroup, IClientAPI remoteClient) | 122 | public override UUID DeleteToInventory(DeRezAction action, UUID folderID, List<SceneObjectGroup> objectGroups, IClientAPI remoteClient) |
123 | { | 123 | { |
124 | UUID assetID = base.DeleteToInventory(action, folderID, objectGroup, remoteClient); | 124 | UUID ret = UUID.Zero; |
125 | |||
126 | // HACK: Only works for lists of length one. | ||
127 | // Intermediate version, just to make things compile | ||
128 | foreach (SceneObjectGroup g in objectGroups) | ||
129 | ret = DeleteToInventory(action, folderID, g, remoteClient); | ||
130 | |||
131 | return ret; | ||
132 | } | ||
133 | |||
134 | public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID, | ||
135 | SceneObjectGroup objectGroup, IClientAPI remoteClient) | ||
136 | { | ||
137 | UUID assetID = base.DeleteToInventory(action, folderID, new List<SceneObjectGroup>() {objectGroup}, remoteClient); | ||
125 | 138 | ||
126 | if (!assetID.Equals(UUID.Zero)) | 139 | if (!assetID.Equals(UUID.Zero)) |
127 | { | 140 | { |