aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs')
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs24
1 files changed, 0 insertions, 24 deletions
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}