From cd6dce11086a4e8a06257659c19eaa66d3b1a951 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 15 Apr 2011 16:42:40 -0700
Subject: Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs
 more testing to make sure HG inventory isn't broken by this (it shouldn't).

---
 .../InventoryAccess/HGInventoryAccessModule.cs     | 27 +++-------------------
 .../InventoryAccess/InventoryAccessModule.cs       | 10 +++++++-
 2 files changed, 12 insertions(+), 25 deletions(-)

(limited to 'OpenSim')

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;
         }
 
         ///
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 8b68dbe..a716326 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -330,11 +330,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         }
                     }
                 }
+
+                // This is a hook to do some per-asset post-processing for subclasses that need that
+                ExportAsset(remoteClient.AgentId, assetID);
             }
             
             return assetID;
         }
-        
+
+        protected virtual void ExportAsset(UUID agentID, UUID assetID)
+        {
+            // nothing to do here
+        }
+
         /// <summary>
         /// Add relevant permissions for an object to the item.
         /// </summary>
-- 
cgit v1.1