diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index e1a70e5764..e9a6adb095 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs @@ -109,120 +109,6 @@ namespace OpenSim.Framework.Communications m_userProfileCacheService = new UserProfileCacheService(this, libraryRootFolder); } - #region Inventory - protected string m_defaultInventoryHost = "default"; - - protected List m_inventoryServices = new List(); - // protected IInventoryServices m_inventoryService; - protected List m_secureinventoryServices = new List(); - - 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 diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 6ea04cff34..aeb6f57b1d 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -656,7 +656,7 @@ namespace OpenSim case "Add-InventoryHost": if (cmdparams.Length > 0) { - m_commsManager.AddInventoryService(cmdparams[0]); + m_log.Info("Not implemented."); } break; diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs index 0e7ab9b366..99a4057b8a 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs @@ -59,16 +59,6 @@ namespace OpenSim.Region.Communications.Hypergrid m_gridService = gridInterComms; m_osw = gridInterComms; - // The HG InventoryService always uses secure handlers - HGInventoryServiceClient invService = new HGInventoryServiceClient(serversInfo.InventoryURL, this.m_userProfileCacheService, true); - invService.UserProfileCache = m_userProfileCacheService; - AddSecureInventoryService(invService); - m_defaultInventoryHost = invService.Host; - if (SecureInventoryService != null) - m_log.Info("[HG]: SecureInventoryService."); - else - m_log.Info("[HG]: Non-secureInventoryService."); - HGUserServices userServices = new HGUserServices(this); // This plugin arrangement could eventually be configurable rather than hardcoded here. userServices.AddPlugin(new TemporaryUserProfilePlugin()); diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs index 1bfc736ca6..568437de8d 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs @@ -53,28 +53,6 @@ namespace OpenSim.Region.Communications.Hypergrid new LocalUserServices( serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); localUserService.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource); - - HGInventoryServiceClient inventoryService - = new HGInventoryServiceClient(serversInfo.InventoryURL, null, false); - List plugins - = DataPluginFactory.LoadDataPlugins( - configSettings.StandaloneInventoryPlugin, - configSettings.StandaloneInventorySource); - - foreach (IInventoryDataPlugin plugin in plugins) - { - // Using the OSP wrapper plugin should be made configurable at some point - inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin, this)); - } - - AddInventoryService(inventoryService); - m_defaultInventoryHost = inventoryService.Host; - m_interServiceInventoryService = inventoryService; - inventoryService.UserProfileCache = UserProfileCacheService; - - // Let's swap to always be secure access to inventory - AddSecureInventoryService((ISecureInventoryService)inventoryService); - m_inventoryServices = null; HGUserServices hgUserService = new HGUserServices(this, localUserService); // This plugin arrangement could eventually be configurable rather than hardcoded here. diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index ceab75b2fb..a658416ce0 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs @@ -42,22 +42,7 @@ namespace OpenSim.Region.Communications.Local LibraryRootFolder libraryRootFolder) : base(serversInfo, libraryRootFolder) { - LocalInventoryService inventoryService = new LocalInventoryService(); - List plugins - = DataPluginFactory.LoadDataPlugins( - configSettings.StandaloneInventoryPlugin, - configSettings.StandaloneInventorySource); - - foreach (IInventoryDataPlugin plugin in plugins) - { - // Using the OSP wrapper plugin for database plugins should be made configurable at some point - inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin, this)); - } - - AddInventoryService(inventoryService); - m_defaultInventoryHost = inventoryService.Host; - m_interServiceInventoryService = inventoryService; - + LocalUserServices lus = new LocalUserServices( serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs index 323f8132ef..8b5779feb4 100644 --- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs +++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs @@ -42,19 +42,6 @@ namespace OpenSim.Region.Communications.OGS1 OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo); m_gridService = gridInterComms; - if (serversInfo.secureInventoryServer) - { - OGS1SecureInventoryService invService = new OGS1SecureInventoryService(serversInfo.InventoryURL); - AddSecureInventoryService(invService); - m_defaultInventoryHost = invService.Host; - } - else - { - OGS1InventoryService invService = new OGS1InventoryService(serversInfo.InventoryURL); - AddInventoryService(invService); - m_defaultInventoryHost = invService.Host; - } - // This plugin arrangement could eventually be configurable rather than hardcoded here. OGS1UserServices userServices = new OGS1UserServices(this); userServices.AddPlugin(new TemporaryUserProfilePlugin()); @@ -65,16 +52,5 @@ namespace OpenSim.Region.Communications.OGS1 m_avatarService = (IAvatarService)m_userService; } - public override void AddInventoryService(string hostUrl) - { - OGS1InventoryService invService = new OGS1InventoryService(hostUrl); - AddInventoryService(invService); - } - - public override void AddSecureInventoryService(string hostUrl) - { - OGS1SecureInventoryService invService = new OGS1SecureInventoryService(hostUrl); - AddSecureInventoryService(invService); - } } } diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs index 87751a4fa4..d404344dec 100644 --- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs +++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs @@ -57,11 +57,6 @@ namespace OpenSim.Tests.Common.Mock public TestCommunicationsManager(NetworkServersInfo serversInfo) : base(serversInfo, null) { - LocalInventoryService lis = new LocalInventoryService(); - m_inventoryDataPlugin = new TestInventoryDataPlugin(); - lis.AddPlugin(m_inventoryDataPlugin); - m_interServiceInventoryService = lis; - AddInventoryService(lis); LocalUserServices lus = new LocalUserServices(991, 992, this); lus.AddPlugin(new TemporaryUserProfilePlugin());