From 5d2a157e64f19a061a37d5458b34cc563ee288a1 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 10 Aug 2009 10:48:21 -0700 Subject: First pass at cleaning up old OGS1 and Local Inventory: removed everything-inventory in CommsManager, which wasn't actively used anymore. --- OpenSim/Region/Application/OpenSim.cs | 2 +- .../Hypergrid/HGCommunicationsGridMode.cs | 10 --------- .../Hypergrid/HGCommunicationsStandalone.cs | 22 -------------------- .../Communications/Local/CommunicationsLocal.cs | 17 +-------------- .../Communications/OGS1/CommunicationsOGS1.cs | 24 ---------------------- 5 files changed, 2 insertions(+), 73 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 6ea04cf..aeb6f57 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 0e7ab9b..99a4057 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 1bfc736..568437d 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 ceab75b..a658416 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 323f813..8b5779f 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); - } } } -- cgit v1.1