OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

slimupdates
Melanie 2010-04-30 11:47:24 +01:00
parent 22b3217113 638dc8d3c2
commit 4cc06ff993
2 changed files with 286 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

477
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker2.cs
View File

@ -41,7 +41,7 @@ using OpenMetaverse;
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
{ {
public class HGInventoryBroker2 : BaseInventoryConnector, INonSharedRegionModule, IInventoryService public class HGInventoryBroker2 : INonSharedRegionModule, IInventoryService
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger( LogManager.GetLogger(
@ -54,8 +54,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
private static ISessionAuthInventoryService m_HGService; // obsolete private static ISessionAuthInventoryService m_HGService; // obsolete
private Dictionary<string, IInventoryService> m_connectors = new Dictionary<string, IInventoryService>(); private Dictionary<string, IInventoryService> m_connectors = new Dictionary<string, IInventoryService>();
// A cache of userIDs --> ServiceURLs, for HGBroker only
protected Dictionary<UUID, string> m_InventoryURLs;
private Scene m_Scene; private Scene m_Scene;
private List<Scene> m_Scenes = new List<Scene>();
private IUserAccountService m_UserAccountService; private IUserAccountService m_UserAccountService;
public Type ReplaceableInterface public Type ReplaceableInterface
@ -124,8 +128,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return; return;
} }
Init(source);
m_Enabled = true; m_Enabled = true;
m_log.Info("[HG INVENTORY CONNECTOR]: HG inventory broker enabled"); m_log.Info("[HG INVENTORY CONNECTOR]: HG inventory broker enabled");
} }
@ -148,18 +150,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return; return;
m_Scene = scene; m_Scene = scene;
m_Scenes.Add(scene);
m_UserAccountService = m_Scene.UserAccountService; m_UserAccountService = m_Scene.UserAccountService;
scene.RegisterModuleInterface<IInventoryService>(this); scene.RegisterModuleInterface<IInventoryService>(this);
m_cache.AddRegion(scene);
scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
scene.EventManager.OnClientClosed += OnClientClosed;
} }
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
{ {
if (!m_Enabled) if (!m_Enabled)
return; return;
m_cache.RemoveRegion(scene); m_Scenes.Remove(scene);
} }
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
@ -171,282 +177,302 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
} }
#region Cache
void OnMakeRootAgent(ScenePresence presence)
{
if (!m_InventoryURLs.ContainsKey(presence.UUID))
CacheInventoryServiceURL(presence.Scene, presence.UUID);
}
void OnClientClosed(UUID clientID, Scene scene)
{
if (m_InventoryURLs.ContainsKey(clientID)) // if it's in cache
{
ScenePresence sp = null;
foreach (Scene s in m_Scenes)
{
s.TryGetScenePresence(clientID, out sp);
if ((sp != null) && !sp.IsChildAgent && (s != scene))
{
m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed in {0}, but user {1} still in sim. Keeping inventoryURL in cache",
scene.RegionInfo.RegionName, clientID);
return;
}
}
m_log.DebugFormat(
"[INVENTORY CACHE]: OnClientClosed in {0}, user {1} out of sim. Dropping inventory URL",
scene.RegionInfo.RegionName, clientID);
DropInventoryServiceURL(clientID);
}
}
/// <summary>
/// Gets the user's inventory URL from its serviceURLs, if the user is foreign,
/// and sticks it in the cache
/// </summary>
/// <param name="userID"></param>
private void CacheInventoryServiceURL(Scene scene, UUID userID)
{
if (scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, userID) == null)
{
// The user does not have a local account; let's cache its service URL
string inventoryURL = string.Empty;
ScenePresence sp = null;
scene.TryGetScenePresence(userID, out sp);
if (sp != null)
{
AgentCircuitData aCircuit = scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
if (aCircuit.ServiceURLs.ContainsKey("InventoryServerURI"))
{
inventoryURL = aCircuit.ServiceURLs["InventoryServerURI"].ToString();
if (inventoryURL != null && inventoryURL != string.Empty)
{
inventoryURL = inventoryURL.Trim(new char[] { '/' });
m_InventoryURLs.Add(userID, inventoryURL);
}
}
}
}
}
private void DropInventoryServiceURL(UUID userID)
{
lock (m_InventoryURLs)
if (m_InventoryURLs.ContainsKey(userID))
m_InventoryURLs.Remove(userID);
}
public string GetInventoryServiceURL(UUID userID)
{
if (m_InventoryURLs.ContainsKey(userID))
return m_InventoryURLs[userID];
return null;
}
#endregion
#region IInventoryService #region IInventoryService
public override bool CreateUserInventory(UUID userID) public bool CreateUserInventory(UUID userID)
{ {
return m_LocalGridInventoryService.CreateUserInventory(userID); return m_LocalGridInventoryService.CreateUserInventory(userID);
} }
public override List<InventoryFolderBase> GetInventorySkeleton(UUID userId) public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
{ {
return m_LocalGridInventoryService.GetInventorySkeleton(userId); return m_LocalGridInventoryService.GetInventorySkeleton(userId);
} }
public override InventoryCollection GetUserInventory(UUID userID) public InventoryCollection GetUserInventory(UUID userID)
{ {
return null; return null;
} }
public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback) public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
{ {
} }
// Inherited. See base public InventoryFolderBase GetRootFolder(UUID userID)
//public override InventoryFolderBase GetFolderForType(UUID userID, AssetType type) {
//{ m_log.DebugFormat("[HGInventory]: GetRootFolder for {0}", userID);
// if (IsLocalGridUser(userID))
// return m_GridService.GetFolderForType(userID, type);
// else
// {
// UUID sessionID = GetSessionID(userID);
// string uri = GetUserInventoryURI(userID) + "/" + userID.ToString();
// // !!!!!!
// return null;
// //return m_HGService.GetFolderForType(uri, sessionID, type);
// }
//}
public override InventoryCollection GetFolderContent(UUID userID, UUID folderID) string invURL = GetInventoryServiceURL(userID);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.GetRootFolder(userID);
IInventoryService connector = GetConnector(invURL);
return connector.GetRootFolder(userID);
}
public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
{
m_log.DebugFormat("[HGInventory]: GetFolderForType {0} type {1}", userID, type);
string invURL = GetInventoryServiceURL(userID);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.GetFolderForType(userID, type);
IInventoryService connector = GetConnector(invURL);
return connector.GetFolderForType(userID, type);
}
public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
{ {
m_log.Debug("[HGInventory]: GetFolderContent " + folderID); m_log.Debug("[HGInventory]: GetFolderContent " + folderID);
string url = string.Empty;
string invURL = m_cache.GetInventoryServiceURL(userID); string invURL = GetInventoryServiceURL(userID);
if (invURL == null) // not there, forward to local inventory connector to resolve if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.GetFolderContent(userID, folderID); return m_LocalGridInventoryService.GetFolderContent(userID, folderID);
IInventoryService connector = GetConnector(url); IInventoryService connector = GetConnector(invURL);
return connector.GetFolderContent(userID, folderID); return connector.GetFolderContent(userID, folderID);
//if (StringToUrlAndUserID(id, out url, out userID))
//{
// ISessionAuthInventoryService connector = GetConnector(url);
// return connector.GetFolderContent(userID, folderID, sessionID);
//}
//return null;
//////////
//string uri = string.Empty;
//if (!IsForeignUser(userID, out uri))
// return m_GridService.GetFolderContent(userID, folderID);
//else
//{
// UUID sessionID = GetSessionID(userID);
// uri = uri + "/" + userID.ToString();
// return m_HGService.GetFolderContent(uri, folderID, sessionID);
//}
} }
public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID) public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
{ {
string uri = string.Empty; m_log.Debug("[HGInventory]: GetFolderItems " + folderID);
if (!IsForeignUser(userID, out uri))
{
// This is not pretty, but it will have to do for now
if (m_LocalGridInventoryService is BaseInventoryConnector)
{
m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetSystemsFolders redirected to RemoteInventoryServiceConnector module");
return ((BaseInventoryConnector)m_LocalGridInventoryService).GetSystemFolders(userID);
}
else
{
m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetSystemsFolders redirected to GetSystemFoldersLocal");
return GetSystemFoldersLocal(userID);
}
}
else
{
UUID sessionID = GetSessionID(userID);
uri = uri + "/" + userID.ToString();
return m_HGService.GetSystemFolders(uri, sessionID);
}
}
private Dictionary<AssetType, InventoryFolderBase> GetSystemFoldersLocal(UUID userID) string invURL = GetInventoryServiceURL(userID);
{
InventoryFolderBase root = m_LocalGridInventoryService.GetRootFolder(userID);
if (root != null)
{
InventoryCollection content = m_LocalGridInventoryService.GetFolderContent(userID, root.ID);
if (content != null)
{
Dictionary<AssetType, InventoryFolderBase> folders = new Dictionary<AssetType, InventoryFolderBase>();
foreach (InventoryFolderBase folder in content.Folders)
{
//m_log.DebugFormat("[HG INVENTORY CONNECTOR]: scanning folder type {0}", (AssetType)folder.Type);
if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
folders[(AssetType)folder.Type] = folder;
}
// Put the root folder there, as type Folder
folders[AssetType.Folder] = root;
m_log.DebugFormat("[HG INVENTORY CONNECTOR]: System folders count for {0}: {1}", userID, folders.Count);
return folders;
}
m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Root folder content not found for {0}", userID);
} if (invURL == null) // not there, forward to local inventory connector to resolve
m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Root folder not found for {0}", userID);
return new Dictionary<AssetType, InventoryFolderBase>();
}
public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
{
string uri = string.Empty;
if (!IsForeignUser(userID, out uri))
return m_LocalGridInventoryService.GetFolderItems(userID, folderID); return m_LocalGridInventoryService.GetFolderItems(userID, folderID);
else
{ IInventoryService connector = GetConnector(invURL);
UUID sessionID = GetSessionID(userID);
uri = uri + "/" + userID.ToString(); return connector.GetFolderItems(userID, folderID);
return m_HGService.GetFolderItems(uri, folderID, sessionID);
}
} }
public override bool AddFolder(InventoryFolderBase folder) public bool AddFolder(InventoryFolderBase folder)
{ {
if (folder == null) if (folder == null)
return false; return false;
string uri = string.Empty; m_log.Debug("[HGInventory]: AddFolder " + folder.ID);
if (!IsForeignUser(folder.Owner, out uri))
string invURL = GetInventoryServiceURL(folder.Owner);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.AddFolder(folder); return m_LocalGridInventoryService.AddFolder(folder);
else
{ IInventoryService connector = GetConnector(invURL);
UUID sessionID = GetSessionID(folder.Owner);
uri = uri + "/" + folder.Owner.ToString(); return connector.AddFolder(folder);
return m_HGService.AddFolder(uri, folder, sessionID);
}
} }
public override bool UpdateFolder(InventoryFolderBase folder) public bool UpdateFolder(InventoryFolderBase folder)
{ {
if (folder == null) if (folder == null)
return false; return false;
string uri = string.Empty; m_log.Debug("[HGInventory]: UpdateFolder " + folder.ID);
if (!IsForeignUser(folder.Owner, out uri))
string invURL = GetInventoryServiceURL(folder.Owner);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.UpdateFolder(folder); return m_LocalGridInventoryService.UpdateFolder(folder);
else
{ IInventoryService connector = GetConnector(invURL);
UUID sessionID = GetSessionID(folder.Owner);
uri = uri + "/" + folder.Owner.ToString(); return connector.UpdateFolder(folder);
return m_HGService.UpdateFolder(uri, folder, sessionID);
}
} }
public override bool DeleteFolders(UUID ownerID, List<UUID> folderIDs) public bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
{ {
if (folderIDs == null) if (folderIDs == null)
return false; return false;
if (folderIDs.Count == 0) if (folderIDs.Count == 0)
return false; return false;
string uri = string.Empty; m_log.Debug("[HGInventory]: DeleteFolders for " + ownerID);
if (!IsForeignUser(ownerID, out uri))
string invURL = GetInventoryServiceURL(ownerID);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.DeleteFolders(ownerID, folderIDs); return m_LocalGridInventoryService.DeleteFolders(ownerID, folderIDs);
else
{ IInventoryService connector = GetConnector(invURL);
UUID sessionID = GetSessionID(ownerID);
uri = uri + "/" + ownerID.ToString(); return connector.DeleteFolders(ownerID, folderIDs);
return m_HGService.DeleteFolders(uri, folderIDs, sessionID);
}
} }
public override bool MoveFolder(InventoryFolderBase folder) public bool MoveFolder(InventoryFolderBase folder)
{ {
if (folder == null) if (folder == null)
return false; return false;
string uri = string.Empty; m_log.Debug("[HGInventory]: MoveFolder for " + folder.Owner);
if (!IsForeignUser(folder.Owner, out uri))
string invURL = GetInventoryServiceURL(folder.Owner);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.MoveFolder(folder); return m_LocalGridInventoryService.MoveFolder(folder);
else
{ IInventoryService connector = GetConnector(invURL);
UUID sessionID = GetSessionID(folder.Owner);
uri = uri + "/" + folder.Owner.ToString(); return connector.MoveFolder(folder);
return m_HGService.MoveFolder(uri, folder, sessionID);
}
} }
public override bool PurgeFolder(InventoryFolderBase folder) public bool PurgeFolder(InventoryFolderBase folder)
{ {
if (folder == null) if (folder == null)
return false; return false;
string uri = string.Empty; m_log.Debug("[HGInventory]: PurgeFolder for " + folder.Owner);
if (!IsForeignUser(folder.Owner, out uri))
string invURL = GetInventoryServiceURL(folder.Owner);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.PurgeFolder(folder); return m_LocalGridInventoryService.PurgeFolder(folder);
else
{ IInventoryService connector = GetConnector(invURL);
UUID sessionID = GetSessionID(folder.Owner);
uri = uri + "/" + folder.Owner.ToString(); return connector.PurgeFolder(folder);
return m_HGService.PurgeFolder(uri, folder, sessionID);
}
} }
// public bool AddItem(InventoryItemBase item) inherited public bool AddItem(InventoryItemBase item)
// Uses AddItemPlain
protected override bool AddItemPlain(InventoryItemBase item)
{ {
if (item == null) if (item == null)
return false; return false;
string uri = string.Empty; m_log.Debug("[HGInventory]: AddItem " + item.ID);
if (!IsForeignUser(item.Owner, out uri))
{ string invURL = GetInventoryServiceURL(item.Owner);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.AddItem(item); return m_LocalGridInventoryService.AddItem(item);
}
else IInventoryService connector = GetConnector(invURL);
{
UUID sessionID = GetSessionID(item.Owner); return connector.AddItem(item);
uri = uri + "/" + item.Owner.ToString();
return m_HGService.AddItem(uri, item, sessionID);
}
} }
public override bool UpdateItem(InventoryItemBase item) public bool UpdateItem(InventoryItemBase item)
{ {
if (item == null) if (item == null)
return false; return false;
string uri = string.Empty; m_log.Debug("[HGInventory]: UpdateItem " + item.ID);
if (!IsForeignUser(item.Owner, out uri))
string invURL = GetInventoryServiceURL(item.Owner);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.UpdateItem(item); return m_LocalGridInventoryService.UpdateItem(item);
else
{ IInventoryService connector = GetConnector(invURL);
UUID sessionID = GetSessionID(item.Owner);
uri = uri + "/" + item.Owner.ToString(); return connector.UpdateItem(item);
return m_HGService.UpdateItem(uri, item, sessionID);
}
} }
public override bool MoveItems(UUID ownerID, List<InventoryItemBase> items) public bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
{ {
if (items == null) if (items == null)
return false; return false;
if (items.Count == 0) if (items.Count == 0)
return true; return true;
string uri = string.Empty; m_log.Debug("[HGInventory]: MoveItems for " + ownerID);
if (!IsForeignUser(ownerID, out uri))
string invURL = GetInventoryServiceURL(ownerID);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.MoveItems(ownerID, items); return m_LocalGridInventoryService.MoveItems(ownerID, items);
else
{ IInventoryService connector = GetConnector(invURL);
UUID sessionID = GetSessionID(ownerID);
uri = uri + "/" + ownerID.ToString(); return connector.MoveItems(ownerID, items);
return m_HGService.MoveItems(uri, items, sessionID);
}
} }
public override bool DeleteItems(UUID ownerID, List<UUID> itemIDs) public bool DeleteItems(UUID ownerID, List<UUID> itemIDs)
{ {
m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Delete {0} items for user {1}", itemIDs.Count, ownerID); m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Delete {0} items for user {1}", itemIDs.Count, ownerID);
@ -455,70 +481,73 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
if (itemIDs.Count == 0) if (itemIDs.Count == 0)
return true; return true;
string uri = string.Empty; m_log.Debug("[HGInventory]: DeleteItems for " + ownerID);
if (!IsForeignUser(ownerID, out uri))
string invURL = GetInventoryServiceURL(ownerID);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.DeleteItems(ownerID, itemIDs); return m_LocalGridInventoryService.DeleteItems(ownerID, itemIDs);
else
{ IInventoryService connector = GetConnector(invURL);
UUID sessionID = GetSessionID(ownerID);
uri = uri + "/" + ownerID.ToString(); return connector.DeleteItems(ownerID, itemIDs);
return m_HGService.DeleteItems(uri, itemIDs, sessionID);
}
} }
public override InventoryItemBase GetItem(InventoryItemBase item) public InventoryItemBase GetItem(InventoryItemBase item)
{ {
if (item == null) if (item == null)
return null; return null;
m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetItem {0} for user {1}", item.ID, item.Owner); m_log.Debug("[HGInventory]: GetItem " + item.ID);
string uri = string.Empty;
if (!IsForeignUser(item.Owner, out uri)) string invURL = GetInventoryServiceURL(item.Owner);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.GetItem(item); return m_LocalGridInventoryService.GetItem(item);
else
{ IInventoryService connector = GetConnector(invURL);
UUID sessionID = GetSessionID(item.Owner);
uri = uri + "/" + item.Owner.ToString(); return connector.GetItem(item);
return m_HGService.QueryItem(uri, item, sessionID);
}
} }
public override InventoryFolderBase GetFolder(InventoryFolderBase folder) public InventoryFolderBase GetFolder(InventoryFolderBase folder)
{ {
if (folder == null) if (folder == null)
return null; return null;
string uri = string.Empty; m_log.Debug("[HGInventory]: GetFolder " + folder.ID);
if (!IsForeignUser(folder.Owner, out uri))
string invURL = GetInventoryServiceURL(folder.Owner);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.GetFolder(folder); return m_LocalGridInventoryService.GetFolder(folder);
else
{ IInventoryService connector = GetConnector(invURL);
UUID sessionID = GetSessionID(folder.Owner);
uri = uri + "/" + folder.Owner.ToString(); return connector.GetFolder(folder);
return m_HGService.QueryFolder(uri, folder, sessionID);
}
} }
public override bool HasInventoryForUser(UUID userID) public bool HasInventoryForUser(UUID userID)
{ {
return false; return false;
} }
public override List<InventoryItemBase> GetActiveGestures(UUID userId) public List<InventoryItemBase> GetActiveGestures(UUID userId)
{ {
return new List<InventoryItemBase>(); return new List<InventoryItemBase>();
} }
public override int GetAssetPermissions(UUID userID, UUID assetID) public int GetAssetPermissions(UUID userID, UUID assetID)
{ {
string uri = string.Empty; m_log.Debug("[HGInventory]: GetAssetPermissions " + assetID);
if (!IsForeignUser(userID, out uri))
string invURL = GetInventoryServiceURL(userID);
if (invURL == null) // not there, forward to local inventory connector to resolve
return m_LocalGridInventoryService.GetAssetPermissions(userID, assetID); return m_LocalGridInventoryService.GetAssetPermissions(userID, assetID);
else
{ IInventoryService connector = GetConnector(invURL);
UUID sessionID = GetSessionID(userID);
uri = uri + "/" + userID.ToString(); return connector.GetAssetPermissions(userID, assetID);
return m_HGService.GetAssetPermissions(uri, assetID, sessionID);
}
} }
#endregion #endregion

92
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
View File

@ -41,7 +41,7 @@ using OpenMetaverse;
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
{ {
public class RemoteXInventoryServicesConnector : BaseInventoryConnector, ISharedRegionModule, IInventoryService public class RemoteXInventoryServicesConnector : ISharedRegionModule, IInventoryService
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -75,10 +75,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
Init(source); Init(source);
} }
protected override void Init(IConfigSource source) protected void Init(IConfigSource source)
{ {
m_RemoteConnector = new XInventoryServicesConnector(source); m_RemoteConnector = new XInventoryServicesConnector(source);
base.Init(source);
} }
@ -122,7 +121,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
} }
scene.RegisterModuleInterface<IInventoryService>(this); scene.RegisterModuleInterface<IInventoryService>(this);
m_cache.AddRegion(scene);
} }
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
@ -130,7 +128,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
if (!m_Enabled) if (!m_Enabled)
return; return;
m_cache.RemoveRegion(scene);
} }
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
@ -146,71 +143,51 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
#region IInventoryService #region IInventoryService
public override bool CreateUserInventory(UUID user) public bool CreateUserInventory(UUID user)
{ {
return false; return false;
} }
public override List<InventoryFolderBase> GetInventorySkeleton(UUID userId) public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
{ {
return new List<InventoryFolderBase>(); return new List<InventoryFolderBase>();
} }
public override InventoryCollection GetUserInventory(UUID userID) public InventoryCollection GetUserInventory(UUID userID)
{ {
return null; return null;
} }
public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback) public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
{ {
try
{
m_RemoteConnector.GetUserInventory(userID, callback);
}
catch (Exception e)
{
if (StatsManager.SimExtraStats != null)
StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure();
m_log.ErrorFormat("[XINVENTORY CONNECTOR]: Request inventory operation failed, {0} {1}",
e.Source, e.Message);
}
} }
// inherited. See base class public InventoryFolderBase GetRootFolder(UUID userID)
// public InventoryFolderBase GetFolderForType(UUID userID, AssetType type) {
return m_RemoteConnector.GetRootFolder(userID);
}
public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID) public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
{
return m_RemoteConnector.GetFolderForType(userID, type);
}
public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID)
{ {
return m_RemoteConnector.GetSystemFolders(userID); return m_RemoteConnector.GetSystemFolders(userID);
} }
public override InventoryCollection GetFolderContent(UUID userID, UUID folderID) public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
{ {
m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolderContent {0}", folderID); return m_RemoteConnector.GetFolderContent(userID, folderID);
try
{
return m_RemoteConnector.GetFolderContent(userID, folderID);
}
catch (Exception e)
{
m_log.ErrorFormat("[XINVENTORY CONNECTOR]: GetFolderContent operation failed, {0} {1}",
e.Source, e.Message);
}
InventoryCollection nullCollection = new InventoryCollection();
nullCollection.Folders = new List<InventoryFolderBase>();
nullCollection.Items = new List<InventoryItemBase>();
nullCollection.UserID = userID;
return nullCollection;
} }
public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
{ {
return m_RemoteConnector.GetFolderItems(userID, folderID); return m_RemoteConnector.GetFolderItems(userID, folderID);
} }
public override bool AddFolder(InventoryFolderBase folder) public bool AddFolder(InventoryFolderBase folder)
{ {
if (folder == null) if (folder == null)
return false; return false;
@ -218,7 +195,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return m_RemoteConnector.AddFolder(folder); return m_RemoteConnector.AddFolder(folder);
} }
public override bool UpdateFolder(InventoryFolderBase folder) public bool UpdateFolder(InventoryFolderBase folder)
{ {
if (folder == null) if (folder == null)
return false; return false;
@ -226,7 +203,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return m_RemoteConnector.UpdateFolder(folder); return m_RemoteConnector.UpdateFolder(folder);
} }
public override bool MoveFolder(InventoryFolderBase folder) public bool MoveFolder(InventoryFolderBase folder)
{ {
if (folder == null) if (folder == null)
return false; return false;
@ -234,7 +211,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return m_RemoteConnector.MoveFolder(folder); return m_RemoteConnector.MoveFolder(folder);
} }
public override bool DeleteFolders(UUID ownerID, List<UUID> folderIDs) public bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
{ {
if (folderIDs == null) if (folderIDs == null)
return false; return false;
@ -245,7 +222,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
} }
public override bool PurgeFolder(InventoryFolderBase folder) public bool PurgeFolder(InventoryFolderBase folder)
{ {
if (folder == null) if (folder == null)
return false; return false;
@ -253,10 +230,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return m_RemoteConnector.PurgeFolder(folder); return m_RemoteConnector.PurgeFolder(folder);
} }
// public bool AddItem(InventoryItemBase item) inherited public bool AddItem(InventoryItemBase item)
// Uses AddItemPlain
protected override bool AddItemPlain(InventoryItemBase item)
{ {
if (item == null) if (item == null)
return false; return false;
@ -264,7 +238,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return m_RemoteConnector.AddItem(item); return m_RemoteConnector.AddItem(item);
} }
public override bool UpdateItem(InventoryItemBase item) public bool UpdateItem(InventoryItemBase item)
{ {
if (item == null) if (item == null)
return false; return false;
@ -272,7 +246,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return m_RemoteConnector.UpdateItem(item); return m_RemoteConnector.UpdateItem(item);
} }
public override bool MoveItems(UUID ownerID, List<InventoryItemBase> items) public bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
{ {
if (items == null) if (items == null)
return false; return false;
@ -281,7 +255,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
} }
public override bool DeleteItems(UUID ownerID, List<UUID> itemIDs) public bool DeleteItems(UUID ownerID, List<UUID> itemIDs)
{ {
if (itemIDs == null) if (itemIDs == null)
return false; return false;
@ -291,7 +265,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return m_RemoteConnector.DeleteItems(ownerID, itemIDs); return m_RemoteConnector.DeleteItems(ownerID, itemIDs);
} }
public override InventoryItemBase GetItem(InventoryItemBase item) public InventoryItemBase GetItem(InventoryItemBase item)
{ {
if (item == null) if (item == null)
return null; return null;
@ -299,7 +273,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return m_RemoteConnector.GetItem(item); return m_RemoteConnector.GetItem(item);
} }
public override InventoryFolderBase GetFolder(InventoryFolderBase folder) public InventoryFolderBase GetFolder(InventoryFolderBase folder)
{ {
m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID); m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID);
if (folder == null) if (folder == null)
@ -308,17 +282,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return m_RemoteConnector.GetFolder(folder); return m_RemoteConnector.GetFolder(folder);
} }
public override bool HasInventoryForUser(UUID userID) public bool HasInventoryForUser(UUID userID)
{ {
return false; return false;
} }
public override List<InventoryItemBase> GetActiveGestures(UUID userId) public List<InventoryItemBase> GetActiveGestures(UUID userId)
{ {
return new List<InventoryItemBase>(); return new List<InventoryItemBase>();
} }
public override int GetAssetPermissions(UUID userID, UUID assetID) public int GetAssetPermissions(UUID userID, UUID assetID)
{ {
return m_RemoteConnector.GetAssetPermissions(userID, assetID); return m_RemoteConnector.GetAssetPermissions(userID, assetID);
} }