Merge branch 'master' into test-merge0418

1 files changed, 3 insertions, 24 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 4565d10..8c99983 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -129,35 +129,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         }
 
         ///
-        /// DeleteToInventory
+        /// Used in DeleteToInventory
         ///
-        public override UUID DeleteToInventory(DeRezAction action, UUID folderID, List<SceneObjectGroup> objectGroups, IClientAPI remoteClient)
+        protected override void ExportAsset(UUID agentID, UUID assetID)
         {
-            UUID ret = UUID.Zero;
-
-            // HACK: Only works for lists of length one.
-            // Intermediate version, just to make things compile
-            foreach (SceneObjectGroup g in objectGroups)
-                ret = DeleteToInventory(action, folderID, g, remoteClient);
-            
-            return ret;
-        }
-
-        // DO NOT OVERRIDE THE BASE METHOD
-        public new virtual UUID DeleteToInventory(DeRezAction action, UUID folderID,
-                SceneObjectGroup objectGroup, IClientAPI remoteClient)
-        {
-            UUID assetID = base.DeleteToInventory(action, folderID, new List<SceneObjectGroup>() {objectGroup}, remoteClient);
-
             if (!assetID.Equals(UUID.Zero))
-            {
-                if (remoteClient != null)
-                    UploadInventoryItem(remoteClient.AgentId, assetID, "", 0);
-            }
+                UploadInventoryItem(agentID, assetID, "", 0);
             else
                 m_log.Debug("[HGScene]: Scene.Inventory did not create asset");
-
-            return assetID;
         }
 
         ///