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.

3 files changed, 9 insertions, 9 deletions

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 189bd29..f768516 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1290,15 +1290,15 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             UICallback sic  = new UICallback();
             UICallback dic  = new UICallback();
-            IInventoryServices iserv = m_app.CommunicationsManager.InventoryService;
+            IInventoryService iserv = m_app.SceneManager.CurrentOrFirstScene.InventoryService;
 
             try
             {
 
                 Dictionary<UUID,UUID> imap = new Dictionary<UUID,UUID>();
 
-                iserv.RequestInventoryForUser(dest, dic.callback);
-                iserv.RequestInventoryForUser(srca, sic.callback);
+                iserv.GetUserInventory(dest, dic.callback);
+                iserv.GetUserInventory(srca, sic.callback);
 
                 dic.GetInventory();
                 sic.GetInventory();
@@ -1436,8 +1436,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     bool select  = false;
 
                     UICallback uic;
-                    IInventoryServices iserv = m_app.CommunicationsManager.InventoryService;
-                    IAssetService      aserv = m_app.SceneManager.CurrentOrFirstScene.AssetService;
+                    IInventoryService iserv = m_app.SceneManager.CurrentOrFirstScene.InventoryService;
+                    IAssetService     aserv = m_app.SceneManager.CurrentOrFirstScene.AssetService;
 
                     doc.LoadXml(File.ReadAllText(dafn));
 
@@ -1511,7 +1511,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         {
                             uic = new UICallback();
                             // Request the inventory
-                            iserv.RequestInventoryForUser(ID, uic.callback);
+                            iserv.GetUserInventory(ID, uic.callback);
 
                             // While the inventory is being fetched, setup for appearance processing
                             if ((mava = m_app.CommunicationsManager.AvatarService.GetUserAppearance(ID)) == null)
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
index 961537c..1e3539f 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
@@ -97,9 +97,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
             get { return main.CommunicationsManager; }
         }
 
-        internal static IInventoryServices InventoryServices
+        internal static IInventoryService InventoryServices
         {
-            get { return Comms.InventoryService; }
+            get { return main.SceneManager.CurrentOrFirstScene.InventoryService; }
         }
 
         internal static IUserService UserServices
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
index 695784b..a1cd116 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -270,7 +270,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                 Rest.Log.DebugFormat("{0} Inventory Root retrieved for {1} {2}",
                                      MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
 
-                Rest.InventoryServices.RequestInventoryForUser(rdata.uuid, rdata.GetUserInventory);
+                Rest.InventoryServices.GetUserInventory(rdata.uuid, rdata.GetUserInventory);
 
                 Rest.Log.DebugFormat("{0} Inventory catalog requested for {1} {2}",
                                      MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);