From 0f367bd7bbc5d22d4834e1eb0f1671381485143e Mon Sep 17 00:00:00 2001 From: diva Date: Wed, 10 Jun 2009 13:18:32 +0000 Subject: 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. --- .../ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/ApplicationPlugins/RemoteController') 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 imap = new Dictionary(); - 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) -- cgit v1.1