diff options
author | Diva Canto | 2009-08-10 10:48:21 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-10 10:48:21 -0700 |
commit | 5d2a157e64f19a061a37d5458b34cc563ee288a1 (patch) | |
tree | dd7c91fb42a9d1c1aaffd2b70377209ac631c6b6 /OpenSim/Region/Communications/Hypergrid | |
parent | AssetCache.addin.xml seems to be historical junk too. Removed. (diff) | |
download | opensim-SC_OLD-5d2a157e64f19a061a37d5458b34cc563ee288a1.zip opensim-SC_OLD-5d2a157e64f19a061a37d5458b34cc563ee288a1.tar.gz opensim-SC_OLD-5d2a157e64f19a061a37d5458b34cc563ee288a1.tar.bz2 opensim-SC_OLD-5d2a157e64f19a061a37d5458b34cc563ee288a1.tar.xz |
First pass at cleaning up old OGS1 and Local Inventory: removed everything-inventory in CommsManager, which wasn't actively used anymore.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs | 22 |
2 files changed, 0 insertions, 32 deletions
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 | |||
59 | m_gridService = gridInterComms; | 59 | m_gridService = gridInterComms; |
60 | m_osw = gridInterComms; | 60 | m_osw = gridInterComms; |
61 | 61 | ||
62 | // The HG InventoryService always uses secure handlers | ||
63 | HGInventoryServiceClient invService = new HGInventoryServiceClient(serversInfo.InventoryURL, this.m_userProfileCacheService, true); | ||
64 | invService.UserProfileCache = m_userProfileCacheService; | ||
65 | AddSecureInventoryService(invService); | ||
66 | m_defaultInventoryHost = invService.Host; | ||
67 | if (SecureInventoryService != null) | ||
68 | m_log.Info("[HG]: SecureInventoryService."); | ||
69 | else | ||
70 | m_log.Info("[HG]: Non-secureInventoryService."); | ||
71 | |||
72 | HGUserServices userServices = new HGUserServices(this); | 62 | HGUserServices userServices = new HGUserServices(this); |
73 | // This plugin arrangement could eventually be configurable rather than hardcoded here. | 63 | // This plugin arrangement could eventually be configurable rather than hardcoded here. |
74 | userServices.AddPlugin(new TemporaryUserProfilePlugin()); | 64 | 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 | |||
53 | new LocalUserServices( | 53 | new LocalUserServices( |
54 | serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); | 54 | serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); |
55 | localUserService.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource); | 55 | localUserService.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource); |
56 | |||
57 | HGInventoryServiceClient inventoryService | ||
58 | = new HGInventoryServiceClient(serversInfo.InventoryURL, null, false); | ||
59 | List<IInventoryDataPlugin> plugins | ||
60 | = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>( | ||
61 | configSettings.StandaloneInventoryPlugin, | ||
62 | configSettings.StandaloneInventorySource); | ||
63 | |||
64 | foreach (IInventoryDataPlugin plugin in plugins) | ||
65 | { | ||
66 | // Using the OSP wrapper plugin should be made configurable at some point | ||
67 | inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin, this)); | ||
68 | } | ||
69 | |||
70 | AddInventoryService(inventoryService); | ||
71 | m_defaultInventoryHost = inventoryService.Host; | ||
72 | m_interServiceInventoryService = inventoryService; | ||
73 | inventoryService.UserProfileCache = UserProfileCacheService; | ||
74 | |||
75 | // Let's swap to always be secure access to inventory | ||
76 | AddSecureInventoryService((ISecureInventoryService)inventoryService); | ||
77 | m_inventoryServices = null; | ||
78 | 56 | ||
79 | HGUserServices hgUserService = new HGUserServices(this, localUserService); | 57 | HGUserServices hgUserService = new HGUserServices(this, localUserService); |
80 | // This plugin arrangement could eventually be configurable rather than hardcoded here. | 58 | // This plugin arrangement could eventually be configurable rather than hardcoded here. |