diff options
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 12 |
1 files changed, 6 insertions, 6 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 | |||
1290 | 1290 | ||
1291 | UICallback sic = new UICallback(); | 1291 | UICallback sic = new UICallback(); |
1292 | UICallback dic = new UICallback(); | 1292 | UICallback dic = new UICallback(); |
1293 | IInventoryServices iserv = m_app.CommunicationsManager.InventoryService; | 1293 | IInventoryService iserv = m_app.SceneManager.CurrentOrFirstScene.InventoryService; |
1294 | 1294 | ||
1295 | try | 1295 | try |
1296 | { | 1296 | { |
1297 | 1297 | ||
1298 | Dictionary<UUID,UUID> imap = new Dictionary<UUID,UUID>(); | 1298 | Dictionary<UUID,UUID> imap = new Dictionary<UUID,UUID>(); |
1299 | 1299 | ||
1300 | iserv.RequestInventoryForUser(dest, dic.callback); | 1300 | iserv.GetUserInventory(dest, dic.callback); |
1301 | iserv.RequestInventoryForUser(srca, sic.callback); | 1301 | iserv.GetUserInventory(srca, sic.callback); |
1302 | 1302 | ||
1303 | dic.GetInventory(); | 1303 | dic.GetInventory(); |
1304 | sic.GetInventory(); | 1304 | sic.GetInventory(); |
@@ -1436,8 +1436,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1436 | bool select = false; | 1436 | bool select = false; |
1437 | 1437 | ||
1438 | UICallback uic; | 1438 | UICallback uic; |
1439 | IInventoryServices iserv = m_app.CommunicationsManager.InventoryService; | 1439 | IInventoryService iserv = m_app.SceneManager.CurrentOrFirstScene.InventoryService; |
1440 | IAssetService aserv = m_app.SceneManager.CurrentOrFirstScene.AssetService; | 1440 | IAssetService aserv = m_app.SceneManager.CurrentOrFirstScene.AssetService; |
1441 | 1441 | ||
1442 | doc.LoadXml(File.ReadAllText(dafn)); | 1442 | doc.LoadXml(File.ReadAllText(dafn)); |
1443 | 1443 | ||
@@ -1511,7 +1511,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1511 | { | 1511 | { |
1512 | uic = new UICallback(); | 1512 | uic = new UICallback(); |
1513 | // Request the inventory | 1513 | // Request the inventory |
1514 | iserv.RequestInventoryForUser(ID, uic.callback); | 1514 | iserv.GetUserInventory(ID, uic.callback); |
1515 | 1515 | ||
1516 | // While the inventory is being fetched, setup for appearance processing | 1516 | // While the inventory is being fetched, setup for appearance processing |
1517 | if ((mava = m_app.CommunicationsManager.AvatarService.GetUserAppearance(ID)) == null) | 1517 | if ((mava = m_app.CommunicationsManager.AvatarService.GetUserAppearance(ID)) == null) |