aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index 2ef0fd3..1268237 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -31,6 +31,7 @@ using OpenSim.Framework;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
33using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
34using OpenSim.Region.Communications.OGS1;
34using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
35 36
36namespace OpenSim.Region.Communications.Hypergrid 37namespace OpenSim.Region.Communications.Hypergrid
@@ -51,7 +52,6 @@ namespace OpenSim.Region.Communications.Hypergrid
51 IAssetCache assetCache, SceneManager sman, LibraryRootFolder libraryRootFolder) 52 IAssetCache assetCache, SceneManager sman, LibraryRootFolder libraryRootFolder)
52 : base(serversInfo, httpServer, assetCache, false, libraryRootFolder) 53 : base(serversInfo, httpServer, assetCache, false, libraryRootFolder)
53 { 54 {
54
55 // From constructor at CommunicationsOGS1 55 // From constructor at CommunicationsOGS1
56 HGGridServices gridInterComms = new HGGridServicesGridMode(serversInfo, httpServer, assetCache, sman, m_userProfileCacheService); 56 HGGridServices gridInterComms = new HGGridServicesGridMode(serversInfo, httpServer, assetCache, sman, m_userProfileCacheService);
57 m_gridService = gridInterComms; 57 m_gridService = gridInterComms;
@@ -63,12 +63,15 @@ namespace OpenSim.Region.Communications.Hypergrid
63 AddSecureInventoryService(invService); 63 AddSecureInventoryService(invService);
64 m_defaultInventoryHost = invService.Host; 64 m_defaultInventoryHost = invService.Host;
65 if (SecureInventoryService != null) 65 if (SecureInventoryService != null)
66 m_log.Info("[HG] SecureInventoryService."); 66 m_log.Info("[HG]: SecureInventoryService.");
67 else 67 else
68 m_log.Info("[HG] Non-secureInventoryService."); 68 m_log.Info("[HG]: Non-secureInventoryService.");
69
70 69
71 HGUserServices userServices = new HGUserServices(this); 70 HGUserServices userServices = new HGUserServices(this);
71 // This plugin arrangement could eventually be configurable rather than hardcoded here.
72 OGS1UserDataPlugin userDataPlugin = new OGS1UserDataPlugin(this);
73 userServices.AddPlugin(userDataPlugin);
74
72 m_userService = userServices; 75 m_userService = userServices;
73 m_messageService = userServices; 76 m_messageService = userServices;
74 m_avatarService = (IAvatarService)m_userService; 77 m_avatarService = (IAvatarService)m_userService;