ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

First pass at cleaning up old OGS1 and Local Inventory: removed everything-inventory in CommsManager, which wasn't actively used anymore.

Browse Source
This commit is contained in:
Diva Canto
2009-08-10 10:48:21 -07:00
parent d12c173a70
commit 5d2a157e64
7 changed files with 2 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Application/OpenSim.cs
View File

@@ -656,7 +656,7 @@ namespace OpenSim
case "Add-InventoryHost":
if (cmdparams.Length > 0)
{
m_commsManager.AddInventoryService(cmdparams[0]);
m_log.Info("Not implemented.");
}
break;

10
OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
View File

@@ -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());

22
OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
View File

@@ -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<IInventoryDataPlugin> plugins
= DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
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.

17
OpenSim/Region/Communications/Local/CommunicationsLocal.cs
View File

@@ -42,22 +42,7 @@ namespace OpenSim.Region.Communications.Local
LibraryRootFolder libraryRootFolder)
: base(serversInfo, libraryRootFolder)
{
LocalInventoryService inventoryService = new LocalInventoryService();
List<IInventoryDataPlugin> plugins
= DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
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);

24
OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
View File

@@ -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);
}
}
}