From f8e0653e73932bae20f483e0ce669f1623c6ff1e Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 5 May 2009 16:45:21 +0000 Subject: * If an item creator id contains an iar loaded name, create a temporary profile and hashed UUID to represent the user --- .../CreateCommsManager/CreateCommsManagerPlugin.cs | 40 +++------------------- 1 file changed, 4 insertions(+), 36 deletions(-) (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs') diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 3ad137e..1059338 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs @@ -166,26 +166,10 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager /// protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) { - LocalInventoryService inventoryService = new LocalInventoryService(); - List plugins - = DataPluginFactory.LoadDataPlugins( - m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, - m_openSim.ConfigurationSettings.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)); - } - - LocalBackEndServices backendService = new LocalBackEndServices(); - - //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService); - m_commsManager = new CommunicationsLocal( m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, - inventoryService, backendService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); + libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); CreateGridInfoService(); } @@ -202,22 +186,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager } protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) - { - // Standalone mode - - HGInventoryServiceClient inventoryService - = new HGInventoryServiceClient(m_openSim.NetServersInfo.InventoryURL, null, false); - List plugins - = DataPluginFactory.LoadDataPlugins( - m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, - m_openSim.ConfigurationSettings.StandaloneInventorySource); - - foreach (IInventoryDataPlugin plugin in plugins) - { - // Using the OSP wrapper plugin should be made configurable at some point - inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin)); - } - + { HGGridServicesStandalone gridService = new HGGridServicesStandalone( m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager); @@ -225,10 +194,9 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager m_commsManager = new HGCommunicationsStandalone( m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, - inventoryService, gridService, + gridService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); - - inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService; + HGServices = gridService; CreateGridInfoService(); -- cgit v1.1