mirror of
https://github.com/opensim/opensim.git
synced 2026-08-12 04:05:42 +08:00
First pass at cleaning up old OGS1 and Local Inventory: removed everything-inventory in CommsManager, which wasn't actively used anymore.
This commit is contained in:
@@ -109,120 +109,6 @@ namespace OpenSim.Framework.Communications
|
||||
m_userProfileCacheService = new UserProfileCacheService(this, libraryRootFolder);
|
||||
}
|
||||
|
||||
#region Inventory
|
||||
protected string m_defaultInventoryHost = "default";
|
||||
|
||||
protected List<IInventoryServices> m_inventoryServices = new List<IInventoryServices>();
|
||||
// protected IInventoryServices m_inventoryService;
|
||||
protected List<ISecureInventoryService> m_secureinventoryServices = new List<ISecureInventoryService>();
|
||||
|
||||
public ISecureInventoryService SecureInventoryService
|
||||
{
|
||||
get
|
||||
{
|
||||
if (m_secureinventoryServices.Count > 0)
|
||||
{
|
||||
// return m_inventoryServices[0];
|
||||
ISecureInventoryService invService;
|
||||
if (TryGetSecureInventoryService(m_defaultInventoryHost, out invService))
|
||||
{
|
||||
return invService;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public IInventoryServices InventoryService
|
||||
{
|
||||
get
|
||||
{
|
||||
if (m_inventoryServices.Count > 0)
|
||||
{
|
||||
// return m_inventoryServices[0];
|
||||
IInventoryServices invService;
|
||||
if (TryGetInventoryService(m_defaultInventoryHost, out invService))
|
||||
{
|
||||
return invService;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public bool TryGetSecureInventoryService(string host, out ISecureInventoryService inventoryService)
|
||||
{
|
||||
if ((host == string.Empty) || (host == "default"))
|
||||
{
|
||||
host = m_defaultInventoryHost;
|
||||
}
|
||||
|
||||
lock (m_secureinventoryServices)
|
||||
{
|
||||
foreach (ISecureInventoryService service in m_secureinventoryServices)
|
||||
{
|
||||
if (service.Host == host)
|
||||
{
|
||||
inventoryService = service;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inventoryService = null;
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool TryGetInventoryService(string host, out IInventoryServices inventoryService)
|
||||
{
|
||||
if ((host == string.Empty) || (host == "default"))
|
||||
{
|
||||
host = m_defaultInventoryHost;
|
||||
}
|
||||
|
||||
lock (m_inventoryServices)
|
||||
{
|
||||
foreach (IInventoryServices service in m_inventoryServices)
|
||||
{
|
||||
if (service.Host == host)
|
||||
{
|
||||
inventoryService = service;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inventoryService = null;
|
||||
return false;
|
||||
}
|
||||
|
||||
public virtual void AddInventoryService(string hostUrl)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public virtual void AddSecureInventoryService(string hostUrl)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public virtual void AddSecureInventoryService(ISecureInventoryService service)
|
||||
{
|
||||
lock (m_secureinventoryServices)
|
||||
{
|
||||
m_secureinventoryServices.Add(service);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void AddInventoryService(IInventoryServices service)
|
||||
{
|
||||
lock (m_inventoryServices)
|
||||
{
|
||||
m_inventoryServices.Add(service);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Friend Methods
|
||||
|
||||
|
||||
Reference in New Issue
Block a user