aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs10
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs22
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs17
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs24
4 files changed, 1 insertions, 72 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.
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index ceab75b..a658416 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -42,22 +42,7 @@ namespace OpenSim.Region.Communications.Local
42 LibraryRootFolder libraryRootFolder) 42 LibraryRootFolder libraryRootFolder)
43 : base(serversInfo, libraryRootFolder) 43 : base(serversInfo, libraryRootFolder)
44 { 44 {
45 LocalInventoryService inventoryService = new LocalInventoryService(); 45
46 List<IInventoryDataPlugin> plugins
47 = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
48 configSettings.StandaloneInventoryPlugin,
49 configSettings.StandaloneInventorySource);
50
51 foreach (IInventoryDataPlugin plugin in plugins)
52 {
53 // Using the OSP wrapper plugin for database plugins should be made configurable at some point
54 inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin, this));
55 }
56
57 AddInventoryService(inventoryService);
58 m_defaultInventoryHost = inventoryService.Host;
59 m_interServiceInventoryService = inventoryService;
60
61 LocalUserServices lus 46 LocalUserServices lus
62 = new LocalUserServices( 47 = new LocalUserServices(
63 serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); 48 serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this);
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 323f813..8b5779f 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -42,19 +42,6 @@ namespace OpenSim.Region.Communications.OGS1
42 OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo); 42 OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo);
43 m_gridService = gridInterComms; 43 m_gridService = gridInterComms;
44 44
45 if (serversInfo.secureInventoryServer)
46 {
47 OGS1SecureInventoryService invService = new OGS1SecureInventoryService(serversInfo.InventoryURL);
48 AddSecureInventoryService(invService);
49 m_defaultInventoryHost = invService.Host;
50 }
51 else
52 {
53 OGS1InventoryService invService = new OGS1InventoryService(serversInfo.InventoryURL);
54 AddInventoryService(invService);
55 m_defaultInventoryHost = invService.Host;
56 }
57
58 // This plugin arrangement could eventually be configurable rather than hardcoded here. 45 // This plugin arrangement could eventually be configurable rather than hardcoded here.
59 OGS1UserServices userServices = new OGS1UserServices(this); 46 OGS1UserServices userServices = new OGS1UserServices(this);
60 userServices.AddPlugin(new TemporaryUserProfilePlugin()); 47 userServices.AddPlugin(new TemporaryUserProfilePlugin());
@@ -65,16 +52,5 @@ namespace OpenSim.Region.Communications.OGS1
65 m_avatarService = (IAvatarService)m_userService; 52 m_avatarService = (IAvatarService)m_userService;
66 } 53 }
67 54
68 public override void AddInventoryService(string hostUrl)
69 {
70 OGS1InventoryService invService = new OGS1InventoryService(hostUrl);
71 AddInventoryService(invService);
72 }
73
74 public override void AddSecureInventoryService(string hostUrl)
75 {
76 OGS1SecureInventoryService invService = new OGS1SecureInventoryService(hostUrl);
77 AddSecureInventoryService(invService);
78 }
79 } 55 }
80} 56}