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/Framework/Communications | |
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/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 114 |
1 files changed, 0 insertions, 114 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index e1a70e5..e9a6adb 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -109,120 +109,6 @@ namespace OpenSim.Framework.Communications | |||
109 | m_userProfileCacheService = new UserProfileCacheService(this, libraryRootFolder); | 109 | m_userProfileCacheService = new UserProfileCacheService(this, libraryRootFolder); |
110 | } | 110 | } |
111 | 111 | ||
112 | #region Inventory | ||
113 | protected string m_defaultInventoryHost = "default"; | ||
114 | |||
115 | protected List<IInventoryServices> m_inventoryServices = new List<IInventoryServices>(); | ||
116 | // protected IInventoryServices m_inventoryService; | ||
117 | protected List<ISecureInventoryService> m_secureinventoryServices = new List<ISecureInventoryService>(); | ||
118 | |||
119 | public ISecureInventoryService SecureInventoryService | ||
120 | { | ||
121 | get | ||
122 | { | ||
123 | if (m_secureinventoryServices.Count > 0) | ||
124 | { | ||
125 | // return m_inventoryServices[0]; | ||
126 | ISecureInventoryService invService; | ||
127 | if (TryGetSecureInventoryService(m_defaultInventoryHost, out invService)) | ||
128 | { | ||
129 | return invService; | ||
130 | } | ||
131 | } | ||
132 | return null; | ||
133 | } | ||
134 | } | ||
135 | |||
136 | public IInventoryServices InventoryService | ||
137 | { | ||
138 | get | ||
139 | { | ||
140 | if (m_inventoryServices.Count > 0) | ||
141 | { | ||
142 | // return m_inventoryServices[0]; | ||
143 | IInventoryServices invService; | ||
144 | if (TryGetInventoryService(m_defaultInventoryHost, out invService)) | ||
145 | { | ||
146 | return invService; | ||
147 | } | ||
148 | } | ||
149 | return null; | ||
150 | } | ||
151 | } | ||
152 | |||
153 | public bool TryGetSecureInventoryService(string host, out ISecureInventoryService inventoryService) | ||
154 | { | ||
155 | if ((host == string.Empty) || (host == "default")) | ||
156 | { | ||
157 | host = m_defaultInventoryHost; | ||
158 | } | ||
159 | |||
160 | lock (m_secureinventoryServices) | ||
161 | { | ||
162 | foreach (ISecureInventoryService service in m_secureinventoryServices) | ||
163 | { | ||
164 | if (service.Host == host) | ||
165 | { | ||
166 | inventoryService = service; | ||
167 | return true; | ||
168 | } | ||
169 | } | ||
170 | } | ||
171 | |||
172 | inventoryService = null; | ||
173 | return false; | ||
174 | } | ||
175 | |||
176 | public bool TryGetInventoryService(string host, out IInventoryServices inventoryService) | ||
177 | { | ||
178 | if ((host == string.Empty) || (host == "default")) | ||
179 | { | ||
180 | host = m_defaultInventoryHost; | ||
181 | } | ||
182 | |||
183 | lock (m_inventoryServices) | ||
184 | { | ||
185 | foreach (IInventoryServices service in m_inventoryServices) | ||
186 | { | ||
187 | if (service.Host == host) | ||
188 | { | ||
189 | inventoryService = service; | ||
190 | return true; | ||
191 | } | ||
192 | } | ||
193 | } | ||
194 | |||
195 | inventoryService = null; | ||
196 | return false; | ||
197 | } | ||
198 | |||
199 | public virtual void AddInventoryService(string hostUrl) | ||
200 | { | ||
201 | |||
202 | } | ||
203 | |||
204 | public virtual void AddSecureInventoryService(string hostUrl) | ||
205 | { | ||
206 | |||
207 | } | ||
208 | |||
209 | public virtual void AddSecureInventoryService(ISecureInventoryService service) | ||
210 | { | ||
211 | lock (m_secureinventoryServices) | ||
212 | { | ||
213 | m_secureinventoryServices.Add(service); | ||
214 | } | ||
215 | } | ||
216 | |||
217 | public virtual void AddInventoryService(IInventoryServices service) | ||
218 | { | ||
219 | lock (m_inventoryServices) | ||
220 | { | ||
221 | m_inventoryServices.Add(service); | ||
222 | } | ||
223 | } | ||
224 | |||
225 | #endregion | ||
226 | 112 | ||
227 | #region Friend Methods | 113 | #region Friend Methods |
228 | 114 | ||