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.

2 files changed, 3 insertions, 3 deletions

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);