aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs18
1 files changed, 17 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index f5789b7..5c2fe33 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -25,9 +25,12 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Collections.Generic;
29using OpenSim.Data;
28using OpenSim.Framework; 30using OpenSim.Framework;
29using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
30using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
33using OpenSim.Framework.Communications.Osp;
31using OpenSim.Framework.Servers; 34using OpenSim.Framework.Servers;
32using OpenSim.Framework.Servers.HttpServer; 35using OpenSim.Framework.Servers.HttpServer;
33using OpenSim.Region.Communications.Local; 36using OpenSim.Region.Communications.Local;
@@ -42,7 +45,6 @@ namespace OpenSim.Region.Communications.Hypergrid
42 NetworkServersInfo serversInfo, 45 NetworkServersInfo serversInfo,
43 BaseHttpServer httpServer, 46 BaseHttpServer httpServer,
44 IAssetCache assetCache, 47 IAssetCache assetCache,
45 LocalInventoryService inventoryService,
46 HGGridServices gridService, 48 HGGridServices gridService,
47 LibraryRootFolder libraryRootFolder, 49 LibraryRootFolder libraryRootFolder,
48 bool dumpAssetsToFile) 50 bool dumpAssetsToFile)
@@ -52,10 +54,24 @@ namespace OpenSim.Region.Communications.Hypergrid
52 new LocalUserServices( 54 new LocalUserServices(
53 serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); 55 serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this);
54 localUserService.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource); 56 localUserService.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource);
57
58 HGInventoryServiceClient inventoryService
59 = new HGInventoryServiceClient(serversInfo.InventoryURL, null, false);
60 List<IInventoryDataPlugin> plugins
61 = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
62 configSettings.StandaloneInventoryPlugin,
63 configSettings.StandaloneInventorySource);
64
65 foreach (IInventoryDataPlugin plugin in plugins)
66 {
67 // Using the OSP wrapper plugin should be made configurable at some point
68 inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin, this));
69 }
55 70
56 AddInventoryService(inventoryService); 71 AddInventoryService(inventoryService);
57 m_defaultInventoryHost = inventoryService.Host; 72 m_defaultInventoryHost = inventoryService.Host;
58 m_interServiceInventoryService = inventoryService; 73 m_interServiceInventoryService = inventoryService;
74 inventoryService.UserProfileCache = UserProfileCacheService;
59 75
60 m_assetCache = assetCache; 76 m_assetCache = assetCache;
61 // Let's swap to always be secure access to inventory 77 // Let's swap to always be secure access to inventory