* Added two new packet handler implementations for inventory ops. This is starting to work! - but can't be activated incrementally, the flip needs to be global for all inventory ops.

* Added a base inventory connector that does common processing of inventory among all reference connector implementations. E.g. AddItem requires additional processing before being forwarded to service.
* Added if (m_Enabled) upon RemoveRegion

1 files changed, 29 insertions, 23 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index d4168fe..62b9bed 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -41,7 +41,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 {
-    public class HGInventoryBroker : InventoryCache, ISharedRegionModule, IInventoryService
+    public class HGInventoryBroker : BaseInventoryConnector, ISharedRegionModule, IInventoryService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         {
         }
 
-        public override void AddRegion(Scene scene)
+        public void AddRegion(Scene scene)
         {
             if (!m_Enabled)
                 return;
@@ -156,12 +156,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
 
             scene.RegisterModuleInterface<IInventoryService>(this);
-            base.AddRegion(scene);
+            m_cache.AddRegion(scene);
         }
 
-        public override void RemoveRegion(Scene scene)
+        public void RemoveRegion(Scene scene)
         {
-            base.RemoveRegion(scene);
+            if (!m_Enabled)
+                return;
+            
+            m_cache.RemoveRegion(scene);
         }
 
         public void RegionLoaded(Scene scene)
@@ -175,17 +178,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         #region IInventoryService
 
-        public bool CreateUserInventory(UUID userID)
+        public override bool CreateUserInventory(UUID userID)
         {
             return m_GridService.CreateUserInventory(userID);
         }
 
-        public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
+        public override List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
         {
             return m_GridService.GetInventorySkeleton(userId);
         }
 
-        public InventoryCollection GetUserInventory(UUID userID)
+        public override InventoryCollection GetUserInventory(UUID userID)
         {
             if (IsLocalGridUser(userID))
                 return m_GridService.GetUserInventory(userID);
@@ -193,7 +196,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                 return null;
         }
 
-        public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
+        public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
         {
             if (IsLocalGridUser(userID))
                 m_GridService.GetUserInventory(userID, callback);
@@ -220,7 +223,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         //    }
         //}
 
-        public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
+        public override InventoryCollection GetFolderContent(UUID userID, UUID folderID)
         {
             if (IsLocalGridUser(userID))
                 return m_GridService.GetFolderContent(userID, folderID);
@@ -271,12 +274,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return new Dictionary<AssetType, InventoryFolderBase>();
         }
 
-        public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
+        public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
         {
             return new List<InventoryItemBase>();
         }
 
-        public bool AddFolder(InventoryFolderBase folder)
+        public override bool AddFolder(InventoryFolderBase folder)
         {
             if (folder == null)
                 return false;
@@ -291,7 +294,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public bool UpdateFolder(InventoryFolderBase folder)
+        public override bool UpdateFolder(InventoryFolderBase folder)
         {
             if (folder == null)
                 return false;
@@ -306,7 +309,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public bool MoveFolder(InventoryFolderBase folder)
+        public override bool MoveFolder(InventoryFolderBase folder)
         {
             if (folder == null)
                 return false;
@@ -321,7 +324,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public bool PurgeFolder(InventoryFolderBase folder)
+        public override bool PurgeFolder(InventoryFolderBase folder)
         {
             if (folder == null)
                 return false;
@@ -336,7 +339,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public bool AddItem(InventoryItemBase item)
+        // public bool AddItem(InventoryItemBase item) inherited
+        // Uses AddItemPlain
+
+        protected override bool AddItemPlain(InventoryItemBase item)
         {
             if (item == null)
                 return false;
@@ -351,7 +357,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public bool UpdateItem(InventoryItemBase item)
+        public override bool UpdateItem(InventoryItemBase item)
         {
             if (item == null)
                 return false;
@@ -366,7 +372,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public bool DeleteItem(InventoryItemBase item)
+        public override bool DeleteItem(InventoryItemBase item)
         {
             if (item == null)
                 return false;
@@ -381,7 +387,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public InventoryItemBase QueryItem(InventoryItemBase item)
+        public override InventoryItemBase QueryItem(InventoryItemBase item)
         {
             if (item == null)
                 return null;
@@ -396,7 +402,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public InventoryFolderBase QueryFolder(InventoryFolderBase folder)
+        public override InventoryFolderBase QueryFolder(InventoryFolderBase folder)
         {
             if (folder == null)
                 return null;
@@ -411,17 +417,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             }
         }
 
-        public bool HasInventoryForUser(UUID userID)
+        public override bool HasInventoryForUser(UUID userID)
         {
             return false;
         }
 
-        public InventoryFolderBase GetRootFolder(UUID userID)
+        public override InventoryFolderBase GetRootFolder(UUID userID)
         {
             return null;
         }
 
-        public List<InventoryItemBase> GetActiveGestures(UUID userId)
+        public override List<InventoryItemBase> GetActiveGestures(UUID userId)
         {
             return new List<InventoryItemBase>();
         }