diff options
author | Diva Canto | 2009-08-10 10:48:21 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-10 10:48:21 -0700 |
commit | 5d2a157e64f19a061a37d5458b34cc563ee288a1 (patch) | |
tree | dd7c91fb42a9d1c1aaffd2b70377209ac631c6b6 /OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | |
parent | AssetCache.addin.xml seems to be historical junk too. Removed. (diff) | |
download | opensim-SC-5d2a157e64f19a061a37d5458b34cc563ee288a1.zip opensim-SC-5d2a157e64f19a061a37d5458b34cc563ee288a1.tar.gz opensim-SC-5d2a157e64f19a061a37d5458b34cc563ee288a1.tar.bz2 opensim-SC-5d2a157e64f19a061a37d5458b34cc563ee288a1.tar.xz |
First pass at cleaning up old OGS1 and Local Inventory: removed everything-inventory in CommsManager, which wasn't actively used anymore.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | 24 |
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 | } |