ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Heart surgery no.2: the inventory service hooks.

Browse Source 
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.
This commit is contained in:
diva
2009-06-10 13:18:32 +00:00
parent 8045ed28ec
commit 0f367bd7bb
34 changed files with 726 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

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