Heart surgery no.2: the inventory service hooks.

Several improvements in the connectors themselves.
Several improvements in configurations.
Needed to add a hack in IUserService and UserManagerBase, to be removed when that service is refactored.

1 files changed, 12 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs
index b695fce..cd13c3d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs
@@ -40,12 +40,10 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
 {
-    public class RemoteInventoryServicesConnector :
-            ISharedRegionModule, IInventoryService
+    public class RemoteInventoryServicesConnector : ISharedRegionModule, IInventoryService
     {
         private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+                LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private bool m_Enabled = false;
         private bool m_Initialized = false;
@@ -57,6 +55,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
             get { return "RemoteInventoryServicesConnector"; }
         }
 
+        public RemoteInventoryServicesConnector()
+        {
+        }
+
         public RemoteInventoryServicesConnector(IConfigSource source)
         {
             Init(source);
@@ -100,7 +102,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
                 return;
 
             if (!m_Initialized)
+            {
                 m_Scene = scene;
+                // ugh!
+                scene.CommsManager.UserProfileCacheService.SetInventoryService(this);
+                scene.CommsManager.UserService.SetInventoryService(this); 
+                m_Initialized = true;
+            }
 
             scene.RegisterModuleInterface<IInventoryService>(this);
         }