diff options
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs | 4 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 2 |
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 | |||
97 | get { return main.CommunicationsManager; } | 97 | get { return main.CommunicationsManager; } |
98 | } | 98 | } |
99 | 99 | ||
100 | internal static IInventoryServices InventoryServices | 100 | internal static IInventoryService InventoryServices |
101 | { | 101 | { |
102 | get { return Comms.InventoryService; } | 102 | get { return main.SceneManager.CurrentOrFirstScene.InventoryService; } |
103 | } | 103 | } |
104 | 104 | ||
105 | internal static IUserService UserServices | 105 | 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 | |||
270 | Rest.Log.DebugFormat("{0} Inventory Root retrieved for {1} {2}", | 270 | Rest.Log.DebugFormat("{0} Inventory Root retrieved for {1} {2}", |
271 | MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); | 271 | MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); |
272 | 272 | ||
273 | Rest.InventoryServices.RequestInventoryForUser(rdata.uuid, rdata.GetUserInventory); | 273 | Rest.InventoryServices.GetUserInventory(rdata.uuid, rdata.GetUserInventory); |
274 | 274 | ||
275 | Rest.Log.DebugFormat("{0} Inventory catalog requested for {1} {2}", | 275 | Rest.Log.DebugFormat("{0} Inventory catalog requested for {1} {2}", |
276 | MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); | 276 | MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); |